4 files changed, 18 insertions, 18 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index da70e19f0..46235e16e 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  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005, 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
@@ -27,9 +27,9 @@ fi
 PKG=$TMP/package-pkgtools
 
 # *** UPDATE THESE WITH EACH BUILD:
-VERSION=13.0
+VERSION=13.1
 ARCH=${ARCH:-noarch}
-BUILD=3
+BUILD=1
 
 if [ ! -d $TMP ]; then
   mkdir -p $TMP # location to build the source
diff --git a/source/a/pkgtools/scripts/explodepkg b/source/a/pkgtools/scripts/explodepkg
index a113b085d..110ebf069 100644
--- a/source/a/pkgtools/scripts/explodepkg
+++ b/source/a/pkgtools/scripts/explodepkg
@@ -46,7 +46,7 @@ Explodes a Slackware compatible software package
 (or any tar+{gzip,bzip2,lzma,xz archive) in the current directory.
 Equivalent to (for each package listed):
 
-  ( umask 000 ; cat package_name | COMPRESSOR -dc | tar xzvf package_name )
+  ( umask 000 ; cat package_name | COMPRESSOR -dc | tar xvf package_name )
 
 Note: This should only be used for debugging or examining packages, not for 
 installing them.  It doesn't execute installation scripts or update the package
diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool
index 6191e36e7..c0a2a9730 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  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2009, 2010  Patrick Volkerding, Sebeka, MN, USA
 #
 # Redistribution and use of this script, with or without modification, is 
 # permitted provided that the following conditions are met:
@@ -81,11 +81,11 @@ if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using bus
   echo "You can't run pkgtool from the rootdisk until you've mounted your Linux"
   echo "partitions beneath /mnt. Here are some examples of this:"
   echo
-  echo "If your root partition is /dev/hda1, and is using ext2fs, you would type:"
-  echo "mount /dev/hda1 /mnt -t ext2"
+  echo "If your root partition is /dev/sda1, and is using ext2fs, you would type:"
+  echo "mount /dev/sda1 /mnt -t ext2"
   echo
-  echo "Then, supposing your /usr partition is /dev/hda2, you must do this:"
-  echo "mount /dev/hda2 /mnt/usr -t ext2"
+  echo "Then, supposing your /usr partition is /dev/sda2, you must do this:"
+  echo "mount /dev/sda2 /mnt/usr -t ext2"
   echo
   echo "Please mount your Linux partitions and then run pkgtool again."
   echo
@@ -210,7 +210,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.0)" \
+  dialog --title "Slackware Package Tool (pkgtool version 13.1)" \
 --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/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index cc3250dae..6b0c2abb4 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -245,7 +245,7 @@ if [ ! -r $ROOT/var/log/packages/$OLD ]; then
 +==============================================================================
 
 EOF
-      installpkg $INCOMINGDIR/$NNAME
+      /sbin/installpkg $INCOMINGDIR/$NNAME
     fi
   fi
   shift 1
@@ -323,11 +323,11 @@ EOF
 
 # Next, the new package is pre-installed:
 if [ "$VERBOSE" = "verbose" ]; then
-  installpkg $INCOMINGDIR/$NNAME
+  /sbin/installpkg $INCOMINGDIR/$NNAME
   RETCODE=$?
 else
   echo "Pre-installing package $NEW..."
-  installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+  /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
   RETCODE=$?
 fi
 # Make sure that worked:
@@ -347,9 +347,9 @@ if [ -d "$ROOT" ]; then
   ( cd $ROOT/var/log/packages
     for rempkg in *-$TIMESTAMP ; do
       if [ "$VERBOSE" = "verbose" ]; then
-        ROOT=$ROOT removepkg $rempkg
+        ROOT=$ROOT /sbin/removepkg $rempkg
       else
-        ROOT=$ROOT removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:"
+        ROOT=$ROOT /sbin/removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:"
       fi
     done
   )
@@ -357,9 +357,9 @@ else
   ( cd /var/log/packages
     for rempkg in *-$TIMESTAMP ; do
       if [ "$VERBOSE" = "verbose" ]; then
-        removepkg $rempkg
+        /sbin/removepkg $rempkg
       else
-        removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:"
+        /sbin/removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:"
       fi
     done
   )
@@ -370,7 +370,7 @@ echo
 # Seriously, the reinstalling of a package can be crucial if any files
 # shift location, so we should always reinstall as the final step:
 if [ ! "$NOT_PARANOID" = "true" ]; then
-  installpkg $INCOMINGDIR/$NNAME
+  /sbin/installpkg $INCOMINGDIR/$NNAME
 fi
 
 echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME."