2 files changed, 51 insertions, 10 deletions

diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
index 3993d4a676bc..5cc119d80ecc 100644
--- a/ports-mgmt/portmaster/Makefile
+++ b/ports-mgmt/portmaster/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portmaster
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	sysutils
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portmaster/files/portmaster.8 b/ports-mgmt/portmaster/files/portmaster.8
index cd5424035525..c5d473250c71 100644
--- a/ports-mgmt/portmaster/files/portmaster.8
+++ b/ports-mgmt/portmaster/files/portmaster.8
@@ -24,12 +24,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 19, 2006
+.Dd August 7, 2006
 .Dt PORTMASTER 8
 .Os
 .Sh NAME
 .Nm portmaster
-.Nd manage your ports
+.Nd manage your ports without external databases or languages
 .Sh SYNOPSIS
 .Nm
 .Op Fl CGbgnv [uf|i] [D|d] m Ar arguments for make
@@ -52,7 +52,7 @@
 .Nm
 .Op Fl a CGbgnv [uf|i] [D|d] m Ar arguments for make
 .Nm
-.Op Fl l
+.Op Fl [l|L]
 .Nm
 .Op Fl s
 .Nm
@@ -63,8 +63,8 @@ The
 .Nm
 utility is a simple tool for managing your ports.
 It uses no external database to track what you
-have installed,
-rather it uses the existing ports infrastructure,
+have installed.
+Rather it uses the existing ports infrastructure,
 including what is located in
 .Pa /var/db/pkg .
 The focus of this tool is to keep the dependency
@@ -75,7 +75,10 @@ having to update all of the ports
 it.
 In the rare case where you do need to recompile
 ports which depend on a port you are updating,
-the -r option exists to accomplish this.
+the
+.Op Fl r
+option exists to accomplish this.
+.Pp
 By default
 .Nm
 will first recurse through the port to update,
@@ -88,6 +91,33 @@ a 'make checksum' process will be launched
 in the background to either verify that the
 correct distfiles are available,
 or start downloading the new ones.
+If you stop
+.Nm
+with ^C, an attempt will be made to kill off all
+the child processes started for this purpose.
+.Pp
+If the recursion through the ports for 'make
+config' does not find a port that needs updating,
+the dependency check step will be skipped prior
+to building the port specified on the command line.
+In addition to this optimization,
+information about up-to-date dependencies,
+choices made on which ports to build for
+interactive mode,
+and ports already visited for 'make config' are
+all cached to enhance performance and prevent
+duplicated efforts.
+.Pp
+While recursing through the dependencies,
+if a port is marked IS_INTERACTIVE this will
+be flagged.
+In the absence of this notification,
+under normal circumstances the only user interaction
+required after the port starts building is to answer
+questions about the deletion of stale distfiles.
+This can be eliminated with the
+.Op Fl d
+option.
 .Sh OPTIONS
 The options are as follows:
 .Bl -tag -width F1
@@ -95,8 +125,6 @@ The options are as follows:
 prevents 'make clean' being run in port directory
 .It Fl G
 prevents the recursive 'make config'
-.It Fl a
-check all ports, update as necessary
 .It Fl b
 create a backup package of the installed port (if any)
 .It Fl g
@@ -106,7 +134,9 @@ do not actually perform any updates
 .It Fl v
 verbose output
 .It Fl u
-unattended mode, accepts defaults for all portmaster dialogues
+unattended mode, accepts defaults for all
+.Nm
+dialogues
 .It Fl f
 always rebuild ports (overrides -i)
 .It Fl i
@@ -128,6 +158,8 @@ rebuild port, and all ports that depend on it
 check all ports, update as necessary
 .It Fl l
 list all installed ports by category
+.It Fl L
+list all installed ports by category, and search for updates
 .It Fl s
 clean out stale ports that used to be depended on
 .It Fl h
@@ -140,6 +172,11 @@ display help file
 Optional system and user configuration files.
 The variables set in the script's getopts routine
 can be specified in these files to enable those options.
+.It Pa /var/db/pkg/*/+IGNOREME
+If this file exists,
+.Nm
+will ignore this port for the purpose of dependency
+updates.
 .El
 .Sh EXIT STATUS
 .Ex -std
@@ -155,6 +192,10 @@ command:
 .Dl "portmaster foo/fooport"
 .Dl "portmaster -r fooport-1.23"
 .Dl "portmaster -o emulators/linux_base-fc4 linux_base-8-8.0_15"
+.Pp
+.Dl "portmaster -L | grep -B1 '	'"
+Print only the ports that have available updates.
+(Note that the whitespace between single quotes is a tab.)
 .Sh SEE ALSO
 .Xr make 1
 .Xr ports 7