Ticket #48909: patch.txt

File patch.txt, 8.4 KB (added by aszostak-partner-eso-org, 9 years ago)

Patch for svn.macports.org/repository/macports/trunk

Line 
1Index: base/doc/port-livecheck.1
2===================================================================
3--- base/doc/port-livecheck.1   (revision 140279)
4+++ base/doc/port-livecheck.1   (working copy)
5@@ -31,7 +31,7 @@
6 .sp
7 \fBport livecheck\fR checks whether a newer version of a given port is available upstream\&. It (usually) does that by automatically downloading a web page and applying a regular expression that extracts a version number\&. If the version number is different from the one the port packages, a message is printed\&.
8 .sp
9-\fBport livecheck\fR is useful for maintainers that want to check whether new versions of their ports are available so they can be updated\&. It can also be used by users that encounter a problem, because updating to the latest upstream version is generally one of the first steps in case of an error of when encountering a bug\&.
10+\fBport livecheck\fR is useful for maintainers that want to check whether new versions of their ports are available so they can be updated\&. It can also be used by users that encounter a problem, because updating to the latest upstream version is generally one of the first steps in case of an error or when encountering a bug\&.
11 .SH "GLOBAL OPTIONS"
12 .sp
13 Please see the section \fBGLOBAL OPTIONS\fR in the \fBport\fR(1) man page for a description of global port options\&.
14Index: base/doc/port-livecheck.1.txt
15===================================================================
16--- base/doc/port-livecheck.1.txt       (revision 140279)
17+++ base/doc/port-livecheck.1.txt       (working copy)
18@@ -23,7 +23,7 @@
19 *port livecheck* is useful for maintainers that want to check whether new
20 versions of their ports are available so they can be updated. It can also be
21 used by users that encounter a problem, because updating to the latest upstream
22-version is generally one of the first steps in case of an error of when
23+version is generally one of the first steps in case of an error or when
24 encountering a bug.
25 
26 include::global-flags.txt[]
27Index: base/doc/port-upgrade.1
28===================================================================
29--- base/doc/port-upgrade.1     (revision 140279)
30+++ base/doc/port-upgrade.1     (working copy)
31@@ -69,7 +69,7 @@
32 \fBvariants.conf\fR(5)
33 .RE
34 .sp
35-In most cases, you should specify the \fBoutdated\fR pseudo\-port expression as argument to \fBport upgrade\fR to upgrade all ports where a newer version is available\&. See \fBport\fR(1) for more information on pseudo\-port expressions\&.
36+In most cases, you should specify the \fBoutdated\fR pseudo\-port expression as argument to \fBport upgrade\fR to upgrade all ports where a newer version is available\&. This is the recommended upgrade method for end users\&. See \fBport\fR(1) for more information on pseudo\-port expressions\&. Upgrading individual packages should only be performed by expert users who know what they are doing, since a mix of upgraded and non\-upgraded packages can lead to various software errors\&.
37 .SH "OPTIONS"
38 .PP
39 \fB\-\-enforce\-variants\fR
40Index: base/doc/port-upgrade.1.txt
41===================================================================
42--- base/doc/port-upgrade.1.txt (revision 140279)
43+++ base/doc/port-upgrade.1.txt (working copy)
44@@ -31,7 +31,11 @@
45 
46 In most cases, you should specify the *outdated* pseudo-port expression as
47 argument to *port upgrade* to upgrade all ports where a newer version is
48-available. See man:port[1] for more information on pseudo-port expressions.
49+available. This is the recommended upgrade method for end users.
50+See man:port[1] for more information on pseudo-port expressions.
51+Upgrading individual packages should only be performed by expert users who
52+know what they are doing, since a mix of upgraded and non-upgraded packages
53+can lead to various software errors.
54 
55 OPTIONS
56 -------
57Index: base/doc/port.1
58===================================================================
59--- base/doc/port.1     (revision 140279)
60+++ base/doc/port.1     (working copy)
61@@ -1,5 +1,5 @@
62 '\" t
63-.TH "PORT" "1" "2014\-11\-11" "MacPorts 2\&.3\&.99" "MacPorts Manual"
64+.TH "PORT" "1" "2015\-01\-12" "MacPorts 2\&.3\&.99" "MacPorts Manual"
65 .\" -----------------------------------------------------------------
66 .\" * Define some portability stuff
67 .\" -----------------------------------------------------------------
68@@ -807,26 +807,43 @@
69 \fB\-R\fR
70 (dependents) above\&.
71 .sp
72-Upgrade the installed
73-\fIportname\fR\&. For example:
74+Upgrade all outdated ports:
75 .sp
76 .if n \{\
77 .RS 4
78 .\}
79 .nf
80-port upgrade vim
81+port upgrade outdated
82 .fi
83 .if n \{\
84 .RE
85 .\}
86 .sp
87-To upgrade all outdated ports:
88+.if n \{\
89 .sp
90+.\}
91+.RS 4
92+.it 1 an-trap
93+.nr an-no-space-flag 1
94+.nr an-break-flag 1
95+.br
96+.ps +1
97+\fBNote\fR
98+.ps -1
99+.br
100+It is recomended to always upgrade all ports with the command indicated above\&. Upgrading single ports as indicated in the subsequent examples should only be performed if you know what you are doing, since this might lead to unexpected software errors from ports that have not yet been upgraded\&.
101+.sp .5v
102+.RE
103+\ \&
104+.sp
105+Upgrade the installed
106+\fIportname\fR\&. For example:
107+.sp
108 .if n \{\
109 .RS 4
110 .\}
111 .nf
112-port upgrade outdated
113+port upgrade vim
114 .fi
115 .if n \{\
116 .RE
117Index: base/doc/port.1.txt
118===================================================================
119--- base/doc/port.1.txt (revision 140279)
120+++ base/doc/port.1.txt (working copy)
121@@ -369,15 +369,25 @@
122     *-R* (dependents) above.
123 +
124 --
125-Upgrade the installed 'portname'. For example:
126+Upgrade all outdated ports:
127+
128 --------
129-port upgrade vim
130+port upgrade outdated
131 --------
132 
133-To upgrade all outdated ports:
134+[NOTE]
135+It is recommended to always upgrade all ports with the command indicated above.
136+Upgrading single ports as indicated in the subsequent examples should only be
137+performed if you know what you are doing, since this might lead to unexpected
138+software errors from ports that have not yet been upgraded.
139 
140+// Forcing a new paragraph here by inserting a dummy space
141+{nbsp}
142+
143+Upgrade the installed 'portname'. For example:
144+
145 --------
146-port upgrade outdated
147+port upgrade vim
148 --------
149 
150 To upgrade 'portname' and the ports that depend on it:
151Index: doc-new/guide/xml/project.xml
152===================================================================
153--- doc-new/guide/xml/project.xml       (revision 140279)
154+++ doc-new/guide/xml/project.xml       (working copy)
155@@ -71,6 +71,10 @@
156             then reinstall. You might also want to run 'port -nR upgrade --force
157             <replaceable>foo</replaceable>' to rebuild ports depending upon
158             port <replaceable>foo</replaceable>.
159+            Note that it is safest and recommended that most users always upgrade
160+            with 'port upgrade outdated' to update all ports at once. Upgrading a
161+            single port can lead to software errors in other ports that have not
162+            yet been upgraded.
163           </para>
164         </listitem>
165       </itemizedlist>
166Index: doc-new/guide/xml/using.xml
167===================================================================
168--- doc-new/guide/xml/using.xml (revision 140279)
169+++ doc-new/guide/xml/using.xml (working copy)
170@@ -825,7 +825,9 @@
171             <programlisting><prompt>$ </prompt><userinput>sudo port upgrade outdated</userinput></programlisting>
172 
173             <para>to update all ports that have an upgrade available. You can, however, selectively upgrade ports if you
174-                want to delay other upgrades until later. To do that, specify the name(s) of the port(s) to upgrade:</para>
175+                want to delay other upgrades until later. This is not recommended unless you know what you are doing,
176+                since you might experience software errors for the ports that have not yet been upgraded. To upgrade
177+                individual ports, specify the name(s) of the port(s) to upgrade:</para>
178 
179             <programlisting><prompt>$ </prompt><userinput>sudo port upgrade gnupg2</userinput></programlisting>
180 
181@@ -1128,8 +1130,8 @@
182 
183             <programlisting><prompt>$ </prompt><userinput>sudo port upgrade outdated</userinput></programlisting>
184 
185-            <para>In case you want to upgrade only a specific port, replace <quote>outdated</quote> in the command given
186-                above with the port's name:</para>
187+            <para>In case you want to upgrade only a specific port (not recommended unless you know what you are doing),
188+                replace <quote>outdated</quote> in the command given above with the port's name:</para>
189 
190             <programlisting><prompt>$ </prompt><userinput>sudo port upgrade makedepend</userinput></programlisting>
191