Update slackware related config and documentation.

Signed-off-by: Darrell Anderson <darrella@clovermail.net>
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 60 insertions, 117 deletions

diff --git a/doc/kpackage/index.docbook b/doc/kpackage/index.docbook
index 45b2a39..a1366d2 100644
--- a/doc/kpackage/index.docbook
+++ b/doc/kpackage/index.docbook
@@ -559,9 +559,8 @@ role="extension">.tgz</literal> packages and a
 packages.</para>
 
 <para>As with Debian distributions the packages in a Slackware
-distribution can be integrated into the package tree. Unfortunately the
-Slackware packages don't carry version information so it is not possible
-to tell with available packages are newer than installed ones.</para>
+distribution can be integrated into the package tree. Slackware
+packages contain version information directly in the package name.</para>
 
 <itemizedlist>
 <listitem><para>The "I" panel is the location of a
@@ -1193,10 +1192,11 @@ management programs: </para>
 <listitem><para><command>pkg_delete</command></para></listitem>
 </itemizedlist>
 
-<para>For Slackware packages  you need: </para>
+<para>For Slackware packages you need: </para>
 
 <itemizedlist>
 <listitem><para><command>installpkg</command> </para></listitem>
+<listitem><para><command>upgradepkg</command> </para></listitem>
 <listitem><para><command>removepkg</command></para></listitem>
 </itemizedlist>
 
diff --git a/knetworkconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in
index 20fb5e0..296bcb2 100755
--- a/knetworkconf/backends/network-conf.in
+++ b/knetworkconf/backends/network-conf.in
@@ -76,9 +76,8 @@ $version = "@VERSION@";
               "conectiva-9", "conectiva-10",
               "vine-3.0", "vine-3.1",
               "ark",
-              "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
-              "slackware-11.0.0", "slackware-12.0.0", "slackware-12.1.0", "slackware-12.2.0", "slackware-13.0.0", "slackware-13.1.0", "slackware-13.37.0", "slackware-14.0.0",
-              "slackware-14.1.0", "gentoo", "vlos-1.2",
+              "slackware-13.0.0.0.0", "slackware-13.1.0", "slackware-13.37.0", "slackware-14.0",
+              "slackware-14.1", "slackware-14.2", "slackware-15.0", "gentoo", "vlos-1.2",
               "freebsd-5", "freebsd-6", "freebsd-7", "freebsd-8", "freebsd-9", "freebsd-10");
 
 $description =<<"end_of_description;";
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index 53f9e8c..7183f15 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -573,19 +573,13 @@ sub gst_network_get_broadcast_ping_cmd
        "vine-3.0"     => "redhat-6.2",
        "vine-3.1"     => "redhat-6.2",
        "ark"          => "redhat-6.2",
-       "slackware-9.1.0" => "redhat-6.2",
-       "slackware-10.0.0" => "redhat-6.2",
-       "slackware-10.1.0" => "redhat-6.2",
-       "slackware-10.2.0" => "redhat-6.2",
-       "slackware-11.0.0" => "redhat-6.2",
-       "slackware-12.0.0" => "redhat-6.2",
-       "slackware-12.1.0" => "redhat-6.2",
-       "slackware-12.2.0" => "redhat-6.2",
-       "slackware-13.0.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",
-       "slackware-14.0.0" => "redhat-6.2",
-       "slackware-14.1.0" => "redhat-6.2",
+       "slackware-14.0" => "redhat-6.2",
+       "slackware-14.1" => "redhat-6.2",
+       "slackware-14.2" => "redhat-6.2",
+       "slackware-15.0" => "redhat-6.2",
        "gentoo"       => "debian-2.2",
        "vlos-1.2"     => "debian-2.2",
        "freebsd-5"    => "debian-2.2",
@@ -1938,19 +1932,13 @@ sub gst_network_get_file
           "vine-3.0"     => \&gst_network_rh62_get_file,
           "vine-3.1"     => \&gst_network_rh62_get_file,
           "ark"          => \&gst_network_rh62_get_file,
-          "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-10.2.0" => \&gst_network_deb22_get_file,
-          "slackware-11.0.0" => \&gst_network_deb22_get_file,
-          "slackware-12.0.0" => \&gst_network_deb22_get_file,
-          "slackware-12.1.0" => \&gst_network_deb22_get_file,
-          "slackware-12.2.0" => \&gst_network_deb22_get_file,
-          "slackware-13.0.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,
-          "slackware-14.0.0" => \&gst_network_deb22_get_file,
-          "slackware-14.1.0" => \&gst_network_deb22_get_file,
+          "slackware-14.0" => \&gst_network_deb22_get_file,
+          "slackware-14.1" => \&gst_network_deb22_get_file,
+          "slackware-14.2" => \&gst_network_deb22_get_file,
+          "slackware-15.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,
@@ -4123,19 +4111,13 @@ sub gst_network_ensure_loopback_interface
           "vine-3.0"     => "lo",
           "vine-3.1"     => "lo",
           "ark"          => "lo",
-          "slackware-9.1.0" => "",
-          "slackware-10.0.0" => "",
-          "slackware-10.1.0" => "",
-          "slackware-10.2.0" => "",
-          "slackware-11.0.0" => "",
-          "slackware-12.0.0" => "",
-          "slackware-12.1.0" => "",
-          "slackware-12.2.0" => "",
-          "slackware-13.0.0" => "",
+          "slackware-13.0.0.0.0" => "",
           "slackware-13.1.0" => "",
           "slackware-13.37.0" => "",
-          "slackware-14.0.0" => "",
-          "slackware-14.1.0" => "",
+          "slackware-14.0" => "",
+          "slackware-14.1" => "",
+          "slackware-14.2" => "",
+          "slackware-15.0" => "",
           "gentoo"       => "",
           "vlos-1.2"     => "",
           "freebsd-5"    => "",
@@ -4352,19 +4334,13 @@ sub gst_network_get_parse_table
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
           "ark"          => "redhat-7.0",
-          "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-10.2.0" => "slackware-9.1.0",
-          "slackware-11.0.0" => "slackware-9.1.0",
-          "slackware-12.0.0" => "slackware-9.1.0",
-          "slackware-12.1.0" => "slackware-9.1.0",
-          "slackware-12.2.0" => "slackware-9.1.0",
-          "slackware-13.0.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",
-          "slackware-14.0.0" => "slackware-9.1.0",
-          "slackware-14.1.0" => "slackware-9.1.0",
+          "slackware-14.0" => "slackware-9.1.0",
+          "slackware-14.1" => "slackware-9.1.0",
+          "slackware-14.2" => "slackware-9.1.0",
+          "slackware-15.0" => "slackware-9.1.0",
           "gentoo"       => "gentoo",
           "vlos-1.2"     => "gentoo",
           "freebsd-5"    => "freebsd-5",
@@ -4827,19 +4803,13 @@ sub gst_network_get_interface_parse_table
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
           "ark"          => "vine-3.0",
-          "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-10.2.0" => "slackware-9.1.0",
-          "slackware-11.0.0" => "slackware-9.1.0",
-          "slackware-12.0.0" => "slackware-9.1.0",
-          "slackware-12.1.0" => "slackware-9.1.0",
-          "slackware-12.2.0" => "slackware-9.1.0",
-          "slackware-13.0.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",
-          "slackware-14.0.0" => "slackware-9.1.0",
-          "slackware-14.1.0" => "slackware-9.1.0",
+          "slackware-14.0" => "slackware-9.1.0",
+          "slackware-14.1" => "slackware-9.1.0",
+          "slackware-14.2" => "slackware-9.1.0",
+          "slackware-15.0" => "slackware-9.1.0",
           "gentoo"       => "gentoo",
           "vlos-1.2"     => "gentoo",
           "freebsd-5"    => "freebsd-5",
@@ -5726,19 +5696,13 @@ sub gst_network_get_replace_table
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
           "ark"          => "redhat-7.0",
-          "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-10.2.0" => "slackware-9.1.0",
-          "slackware-11.0.0" => "slackware-9.1.0",
-          "slackware-12.0.0" => "slackware-9.1.0",
-          "slackware-12.1.0" => "slackware-9.1.0",
-          "slackware-12.2.0" => "slackware-9.1.0",
-          "slackware-13.0.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",
-          "slackware-14.0.0" => "slackware-9.1.0",
-          "slackware-14.1.0" => "slackware-9.1.0",
+          "slackware-14.0" => "slackware-9.1.0",
+          "slackware-14.1" => "slackware-9.1.0",
+          "slackware-14.2" => "slackware-9.1.0",
+          "slackware-15.0" => "slackware-9.1.0",
           "gentoo"       => "gentoo",
           "vlos-1.2"     => "gentoo",
           "freebsd-5"    => "freebsd-5",
@@ -6193,19 +6157,13 @@ sub gst_network_get_interface_replace_table
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
           "ark"          => "vine-3.0",
-          "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-10.2.0" => "slackware-9.1.0",
-          "slackware-11.0.0" => "slackware-9.1.0",
-          "slackware-12.0.0" => "slackware-9.1.0",
-          "slackware-12.1.0" => "slackware-9.1.0",
-          "slackware-12.2.0" => "slackware-9.1.0",
-          "slackware-13.0.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",
-          "slackware-14.0.0" => "slackware-9.1.0",
-          "slackware-14.1.0" => "slackware-9.1.0",
+          "slackware-14.0" => "slackware-9.1.0",
+          "slackware-14.1" => "slackware-9.1.0",
+          "slackware-14.2" => "slackware-9.1.0",
+          "slackware-15.0" => "slackware-9.1.0",
           "gentoo"       => "gentoo",
           "vlos-1.2"     => "gentoo",
           "freebsd-5"    => "freebsd-5",
diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in
index cbe006f..d479154 100644
--- a/knetworkconf/backends/platform.pl.in
+++ b/knetworkconf/backends/platform.pl.in
@@ -110,22 +110,13 @@ $PLATFORM_INFO = {
   "suse-11.2"       => "SuSE Linux 11.2",
   "suse-11.3"       => "SuSE Linux 11.3",
   "turbolinux-7.0"  => "Turbolinux 7.0",
-  "slackware-8.0.0" => "Slackware 8.0.0",
-  "slackware-8.1"   => "Slackware 8.1",
-  "slackware-9.0.0" => "Slackware 9.0.0",
-  "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-10.2.0" => "Slackware 10.2.0",
-  "slackware-11.0.0" => "Slackware 11.0.0",
-  "slackware-12.0.0" => "Slackware 12.0.0",
-  "slackware-12.1.0" => "Slackware 12.1.0",
-  "slackware-12.2.0" => "Slackware 12.2.0",
-  "slackware-13.0.0" => "Slackware 13.0.0",
-  "slackware-13.1.0" => "Slackware 13.1.0",
-  "slackware-13.37.0" => "Slackware 13.37.0",
-  "slackware-14.0.0" => "Slackware 14.0.0",
-  "slackware-14.1.0" => "Slackware 14.1.0",
+  "slackware-13.0.0.0.0" => "Slackware 13.0",
+  "slackware-13.1.0" => "Slackware 13.1",
+  "slackware-13.37.0" => "Slackware 13.37",
+  "slackware-14.0" => "Slackware 14.0",
+  "slackware-14.1" => "Slackware 14.1",
+  "slackware-14.2" => "Slackware 14.2",
+  "slackware-15.0" => "Slackware 15.0",
   "freebsd-4"       => "FreeBSD 4",
   "freebsd-5"       => "FreeBSD 5",
   "freebsd-6"       => "FreeBSD 6",
diff --git a/knetworkconf/backends/service.pl.in b/knetworkconf/backends/service.pl.in
index 72a149f..605fd10 100644
--- a/knetworkconf/backends/service.pl.in
+++ b/knetworkconf/backends/service.pl.in
@@ -387,19 +387,13 @@ sub gst_service_get_runlevel_roles
      "vine-3.1"       => "redhat-5.2",
      "ark"            => "redhat-5.2",
 
-     "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-10.2.0" => "slackware-9.1.0",
-     "slackware-11.0.0" => "slackware-9.1.0",
-     "slackware-12.0.0" => "slackware-9.1.0",
-     "slackware-12.1.0" => "slackware-9.1.0",
-     "slackware-12.2.0" => "slackware-9.1.0",
-     "slackware-13.0.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",
-     "slackware-14.0.0" => "slackware-9.1.0",
-     "slackware-14.1.0" => "slackware-9.1.0",
+     "slackware-14.0" => "slackware-9.1.0",
+     "slackware-14.1" => "slackware-9.1.0",
+     "slackware-14.2" => "slackware-9.1.0",
+     "slackware-15.0" => "slackware-9.1.0",
 
      "gentoo"         => "gentoo",
      "vlos-1.2"       => "gentoo",
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index bf2be7b..b5841b5 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -72,7 +72,7 @@ SLACK::SLACK():pkgInterface()
   updated_pict = UserIcon("supdated");
   new_pict = UserIcon("snew");
 
-  packagePattern = "*.tgz *.tar.gz";
+  packagePattern = "*.tgz *.tar.gz *.txz";
   typeID = "/slack";
 
   locatedialog = 0;
@@ -82,14 +82,14 @@ SLACK::SLACK():pkgInterface()
 
   locatedialog = new Locations(i18n("Location of Slackware Package Archives"));
   locatedialog->pLocations(1, 1, this,  i18n("Install location", "I"),
-  "Slackware", "*.TXT *.txt *.tgz *.tar.gz",
+  "Slackware", "*.TXT *.txt *.tgz *.tar.gz *.txz",
   i18n("Location of a 'PACKAGES.TXT' File for Extended Information"));
   locatedialog->pLocations(4, 1, this,  i18n("Packages file", "P"),
-  "Slackware", "*.tgz *.tar.gz",
+  "Slackware", "*.tgz *.tar.gz *.txz",
   i18n("Location of 'PACKAGES.TXT' File for Slackware Distribution"),
   i18n("Location of Base Folder of Slackware Distribution"));
   locatedialog->dLocations(2, 6, this,  i18n("Folders", "F"),
-  "Slackware", "*.tgz *.tar.gz",
+  "Slackware", "*.tgz *.tar.gz *.txz",
   i18n("Location of Folders Containing Slackware Packages"));
 
   connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)),
@@ -122,13 +122,14 @@ void SLACK::initTranslate()
   trl->insert("e",new TQString(i18n("GNU EMacs")));
   trl->insert("f",new TQString(i18n("FAQs")));
   trl->insert("k",new TQString(i18n("Kernel Source")));
+  trl->insert("kde",new TQString(i18n("KDE")));
+  trl->insert("l",new TQString(i18n("Libraries")));
   trl->insert("n",new TQString(i18n("Networking")));
   trl->insert("t",new TQString(i18n("TeX Distribution")));
   trl->insert("tcl",new TQString(i18n("TCL Script Language")));
   trl->insert("x",new TQString(i18n("X Window System")));
   trl->insert("xap",new TQString(i18n("X Applications")));
-  trl->insert("xd",new TQString(i18n("X Development Tools")));
-  trl->insert("xv",new TQString(i18n("XView and OpenLook")));
+  trl->insert("xfce",new TQString(i18n("Xfce")));
   trl->insert("y",new TQString(i18n("Games")));
 }