3 files changed, 13 insertions, 6 deletions

diff --git a/ports-mgmt/portmaster/files/bash-completions b/ports-mgmt/portmaster/files/bash-completions
index 819b6c709014..6486a8d5c774 100644
--- a/ports-mgmt/portmaster/files/bash-completions
+++ b/ports-mgmt/portmaster/files/bash-completions
@@ -11,7 +11,7 @@ _portmaster () {
 		--check-port-dbdir --list-origins --packages --packages-only \
 		--packages-build --packages-if-newer --delete-build-only \
 		--always-fetch --local-packagedir= --packages-delete \
-		--no-confirm --no-term-title --index --index-only \
+		--no-confirm --no-term-title --index --index-first --index-only \
 		--help --version' -- $cur ) )
 		;;
 	*)	COMPREPLY=( $( compgen -d /var/db/pkg/$cur ) )
diff --git a/ports-mgmt/portmaster/files/portmaster.8 b/ports-mgmt/portmaster/files/portmaster.8
index f0b58a816ea4..4c54d7cb8420 100644
--- a/ports-mgmt/portmaster/files/portmaster.8
+++ b/ports-mgmt/portmaster/files/portmaster.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 9, 2010
+.Dd May 1, 2010
 .Dt PORTMASTER 8
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@ Common Flags:
 .Op Fl -delete-packages
 .Op Fl -no-confirm
 .Op Fl -no-term-title
-.Op --index|--index-only
+.Op --index|--index-first|--index-only
 .Op Fl m Ar arguments for make
 .Op Fl x Ar glob pattern to exclude from building
 .Nm
@@ -433,7 +433,9 @@ be installed and/or updated before proceeding
 .It Fl -no-term-title
 do not update the xterm title bar
 .It Fl -index
-use INDEX-[6-9] to check if a port is out of date
+use INDEX-[6-9] exclusively to check if a port is up to date
+.It Fl -index-first
+use the INDEX for status, but double-check with the port
 .It Fl -index-only
 do not try to use
 .Pa /usr/ports .
@@ -658,9 +660,13 @@ along with their related options.
 # Do not update the xterm title bar (--no-term-title)
 # PM_NO_TERM_TITLE=pm_no_term_title
 #
-# Use the INDEX file to check if a port is out of date (--index)
+# Use only the INDEX file to check if a port is out of date (--index)
 # PM_INDEX=pm_index
 #
+# Use the INDEX file first, then check /usr/ports (--index-first)
+# PM_INDEX=pm_index
+# PM_INDEX_FIRST=pm_index_first
+#
 # Use the INDEX file instead of /usr/ports (--index-only)
 # PM_INDEX=pm_index
 # PM_INDEX_ONLY=pm_index_only
diff --git a/ports-mgmt/portmaster/files/zsh-completions b/ports-mgmt/portmaster/files/zsh-completions
index eaf135349926..f9d8167da682 100644
--- a/ports-mgmt/portmaster/files/zsh-completions
+++ b/ports-mgmt/portmaster/files/zsh-completions
@@ -25,7 +25,8 @@ _arguments -A "-*" : \
   "-x[avoid building or updating ports that match this pattern]:glob pattern to exclude from building:->pkgs" \
   "--no-confirm[do not ask user to confirm list of ports to be installed and/or updated before proceeding]" \
   "--no-term-title[do not update the xterm title bar]" \
-  "--index[use INDEX to check if a port is out of date]" \
+  "--index[use INDEX exclusively to check if a port is up to date]" \
+  "--index-first[use the INDEX for status, but double-check with the port]" \
   "--index-only[do not try to use /usr/ports]" \
   "--show-work[list what ports are and would be installed]" \
   "-o[replace the installed port with a port from a different origin]:new port dir in /usr/ports:->ports" \