7 files changed, 29 insertions, 6 deletions
diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8
index 3a0e2a2c3..9b0cd9fe7 100644
--- a/source/a/pkgtools/manpages/installpkg.8
+++ b/source/a/pkgtools/manpages/installpkg.8
@@ -16,6 +16,9 @@ installpkg \- install Slackware packages.
 .B \--warn
 ]
 [
+.B \--dry-run
+]
+[
 .B \--md5sum
 ]
 [
@@ -63,6 +66,9 @@ Generate a list of files that would be overwritten to the standard output, but d
 not actually install the package.  The list is formatted in a suitable fashion to
 use as a list of files to backup.
 .TP
+.B \--dry-run packagename
+This option does the same thing as --warn.
+.TP
 .B \--md5sum packagename
 Record the package md5sum in the metadata written in /var/lib/pkgtools/packages.
 .TP
diff --git a/source/a/pkgtools/manpages/removepkg.8 b/source/a/pkgtools/manpages/removepkg.8
index f9b1b9322..25a66dcaa 100644
--- a/source/a/pkgtools/manpages/removepkg.8
+++ b/source/a/pkgtools/manpages/removepkg.8
@@ -36,6 +36,9 @@ removepkg \- remove Slackware packages.
 [
 .B \--warn
 ]
+[
+.B \--dry-run
+]
 .BI packagename
 .SH DESCRIPTION
 .B removepkg
@@ -112,6 +115,9 @@ Remove the package displaying only a single description line to stdout.
 .B \--warn packagename
 Generate a report to the standard output about which files and directories
 would be removed, but does not actually remove the package.
+.TP
+.B \--dry-run packagename
+This option does the same thing as --warn.
 .SH " "
 It's possible to remove a package from a filesystem
 other than / by supplying
diff --git a/source/a/pkgtools/manpages/upgradepkg.8 b/source/a/pkgtools/manpages/upgradepkg.8
index 757d60031..73f204af1 100644
--- a/source/a/pkgtools/manpages/upgradepkg.8
+++ b/source/a/pkgtools/manpages/upgradepkg.8
@@ -16,6 +16,9 @@ upgradepkg \- upgrade Slackware packages.
 .B --dry-run
 ]
 [
+.B --warn
+]
+[
 .B --install-new
 ]
 [
@@ -38,6 +41,9 @@ upgradepkg \- upgrade Slackware packages.
 .B --dry-run
 ]
 [
+.B --warn
+]
+[
 .B --install-new
 ]
 [
@@ -84,6 +90,9 @@ ROOT=/mnt upgradepkg package.txz (or .tbz, .tgz, .tlz)
 Output a report about which packages would be installed or upgraded
 but don't actually perform the upgrades.
 .TP
+.B \--warn
+This option does the same thing as --warn.
+.TP
 .B \--install-new
 Normally upgradepkg only upgrades packages that are already installed on the system, and
 will skip any packages that do not already have a version installed.
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index ab2f57334..38f807a1c 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.1
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index c5c6ee2af..7eea53629 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -167,6 +167,7 @@ Installpkg is used to install a .t{gz,bz,lz,xz} package like this:
    installpkg slackware-package-1.0.0-i486-1.tgz (or .tbz, .tlz, .txz)
 
 options:      --warn (warn if files will be overwritten, but do not install)
+              --dry-run (same as --warn)
               --root /mnt (install someplace else, like /mnt)
               --infobox (use dialog to draw an info box)
               --terse (display a one-line short description for install)
@@ -231,7 +232,7 @@ fi
 
 # Parse options:
 while [ 0 ]; do
-  if [ "$1" = "-warn" -o "$1" = "--warn" ]; then
+  if [ "$1" = "-warn" -o "$1" = "--warn" -o "$1" = "-dry-run" -o "$1" = "--dry-run" ]; then
     MODE=warn
     shift 1
   elif [ "$1" = "-md5sum" -o "$1" = "--md5sum" ]; then
diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg
index 0113c0fd8..161057ea0 100644
--- a/source/a/pkgtools/scripts/removepkg
+++ b/source/a/pkgtools/scripts/removepkg
@@ -430,7 +430,7 @@ remove_packages() {
 }
 
 if [ "$#" = "0" ]; then
-  echo "Usage: $(basename $0) [--copy] [--keep] [--preserve] [--skip-douninst] [--terse] [--warn] packagename ..."; exit 1
+  echo "Usage: $(basename $0) [--copy] [--keep] [--preserve] [--skip-douninst] [--terse] [--warn] [--dry-run] packagename ..."; exit 1
 fi
 
 while : ; do
@@ -440,8 +440,8 @@ while : ; do
   -preserve | --preserve) PRESERVE=true; shift;;
   -skip-douninst | --skip-douninst) SKIP_DOUNINST=true; shift;;
   -terse | --terse) TERSE=0; shift;;
-  -warn | --warn) WARN=true; shift;;
-  -* | --*) echo "Usage: $(basename $0) [-copy] [-keep] [-preserve] [-warn] packagename ..."; exit 1;;
+  -warn | --warn | -dry-run | --dry-run) WARN=true; shift;;
+  -* | --*) echo "Usage: $(basename $0) [--copy] [--keep] [--preserve] [--warn] [--dry-run] packagename ..."; exit 1;;
   *) break
  esac
 done
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index 9ae3ce204..49c5d9da8 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -80,6 +80,7 @@ To operate on an alternate directory, such as /mnt:
 
 Options:
  --dry-run              only display what would be done
+ --warn                 same as --dry-run
  --install-new          install new packages also
  --reinstall            upgrade packages of the same version
  --terse                display a single line for each package operation
@@ -155,7 +156,7 @@ while [ 0 ]; do
     # We're adding a --verbose mode that doesn't filter removepkg as much
     VERBOSE="verbose"
     shift 1
-  elif [ "$1" = "-dry-run" -o "$1" = "--dry-run" ]; then
+  elif [ "$1" = "-dry-run" -o "$1" = "--dry-run" -o "$1" = "-warn" -o "$1" = "--warn" ]; then
     # Output a report about which packages would be installed or upgraded
     # but don't actually perform the upgrades.
     DRY_RUN="true"