Changeset 15665 for trunk/base

Timestamp:

Jan 1, 2006, 3:24:48 PM (18 years ago)

Author:

olegb

Message:

Bug:
Submitted by:
Reviewed by:
Approved by: jmpp@
Obtained from:
Removal of -a

• removed from port.tcl
• removed from port(1)

Location:

trunk/base/src/port

Files:

• port.1 (modified) (3 diffs)
• port.tcl (modified) (5 diffs)

trunk/base/src/port/port.1

@@ -37 +37 @@
 .Sh SYNOPSIS
 .Nm
-.Op Fl vdqfonausbckt
+.Op Fl vdqfonusbckt
 .Op Fl D Ar portdir
 .Ar action
@@ -201 +201 @@
 .It Fl n
 dont follow dependencies in upgrade (only for upgrading)
-.It Fl a
-upgrade all installed ports (only for upgrading)
 .It Fl u
 uninstall non-active ports when upgrading and uninstalling
@@ -281 +279 @@
 Upgrade the installed
 .Ar portname .
-To upgrade all ports, use
-.Fl a .
 For example:
 .Pp
 .Dl "port upgrade vim"
-.Dl "port -a upgrade"
+.Pp
+To upgrade all installed ports:
+.Pp
+.Dl "port upgrade installed"
 .Pp
 To upgrade

trunk/base/src/port/port.tcl

@@ -3 +3 @@
 exec @TCLSH@ "$0" "$@"
 # port.tcl
-# $Id: port.tcl,v 1.144 2005/12/29 02:34:36 olegb Exp $
+# $Id: port.tcl,v 1.145 2006/01/01 15:24:48 olegb Exp $
 #
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -139 +139 @@
 proc print_usage args {
         global cmdname
-        set usage { [-vdqfonasbcktu] [-D portdir] action [actionflags]
+        set usage { [-vdqfonsbcktu] [-D portdir] action [actionflags]
 [[portname|pseudo-portname|port-url] [@version] [+-variant]... [option=value]...]...
 }
@@ -151 +151 @@
         global cmdname
         
-        set help { [-vdqfonasbcktu] [-D portdir] action [actionflags]
+        set help { [-vdqfonsbcktu] [-D portdir] action [actionflags]
 [[portname|pseudo-portname|port-url] [@version] [+-variant]... [option=value]...]...
         
@@ -1118 +1118 @@
                                 o { set global_options(ports_ignore_older) yes  }
                                 n { set global_options(ports_nodeps) yes                }
-                                a { set global_options(port_upgrade_all) yes    }
                                 u { set global_options(port_uninstall_old) yes  }
                                 s { set global_options(ports_source_only) yes   }
@@ -1351 +1350 @@
         
         upgrade {
-        if {[info exists global_options(port_upgrade_all)] } {
-                        # if -a then upgrade all installed ports
-                        # (union these to any other ports user has in the port list)
-                        set portlist [opUnion $portlist [get_installed_ports]]
-        } else {
-                # Otherwise if the user has supplied no ports we'll use the current port
-                        require_portlist
-        }
+        # Otherwise if the user has supplied no ports we'll use the current port
+                require_portlist
                 
                 foreachport $portlist {