Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
devel/nbpatch/files/nbpatch.cat1
View File

@@ -1,20 +1,21 @@
PATCH(1) NetBSD General Commands Manual PATCH(1)
PATCH(1) General Commands Manual PATCH(1)
NNAAMMEE
ppaattcchh -- apply a diff file to an original
ppaattcchh - apply a diff file to an original
SSYYNNOOPPSSIISS
ppaattcchh [--bbCCccEEeeffllNNnnRRssttuuvv] [--BB _b_a_c_k_u_p_-_p_r_e_f_i_x] [--DD _s_y_m_b_o_l] [--dd _d_i_r_e_c_t_o_r_y]
[--FF _m_a_x_-_f_u_z_z] [--ii _p_a_t_c_h_f_i_l_e] [--oo _o_u_t_-_f_i_l_e] [--pp _s_t_r_i_p_-_c_o_u_n_t]
[--rr _r_e_j_-_n_a_m_e] [--VV tt | nniill | nneevveerr] [--xx _n_u_m_b_e_r] [--zz _b_a_c_k_u_p_-_e_x_t]
[----ppoossiixx] [_o_r_i_g_f_i_l_e [_p_a_t_c_h_f_i_l_e]]
[--rr _r_e_j_-_n_a_m_e] [--VV tt | nniill | nneevveerr | nnoonnee] [--xx _n_u_m_b_e_r]
[--zz _b_a_c_k_u_p_-_e_x_t] [----ppoossiixx] [_o_r_i_g_f_i_l_e [_p_a_t_c_h_f_i_l_e]]
ppaattcchh <_p_a_t_c_h_f_i_l_e
DDEESSCCRRIIPPTTIIOONN
ppaattcchh will take a patch file containing any of the four forms of differ-
ence listing produced by the diff(1) program and apply those differences
to an original file, producing a patched version. If _p_a_t_c_h_f_i_l_e is omit-
ted, or is a hyphen, the patch will be read from the standard input.
ppaattcchh will take a patch file containing any of the four forms of
difference listing produced by the diff(1) program and apply those
differences to an original file, producing a patched version. If
_p_a_t_c_h_f_i_l_e is omitted, or is a hyphen, the patch will be read from the
standard input.
ppaattcchh will attempt to determine the type of the diff listing, unless
over-ruled by a --cc, --ee, --nn, or --uu option. Context diffs (old-style, new-
@@ -54,9 +55,9 @@ DDEESSCCRRIIPPTTIIOONN
--DD _s_y_m_b_o_l, ----iiffddeeff _s_y_m_b_o_l
Causes ppaattcchh to use the "#ifdef...#endif" construct to mark
changes. The argument following will be used as the differenti-
ating symbol. Note that, unlike the C compiler, there must be a
space between the --DD and the argument.
changes. The argument following will be used as the
differentiating symbol. Note that, unlike the C compiler, there
must be a space between the --DD and the argument.
--dd _d_i_r_e_c_t_o_r_y, ----ddiirreeccttoorryy _d_i_r_e_c_t_o_r_y
Causes ppaattcchh to interpret the next argument as a directory, and
@@ -71,25 +72,26 @@ DDEESSCCRRIIPPTTIIOONN
Forces ppaattcchh to interpret the patch file as an ed(1) script.
--FF _m_a_x_-_f_u_z_z, ----ffuuzzzz _m_a_x_-_f_u_z_z
Sets the maximum fuzz factor. This option only applies to con-
text diffs, and causes ppaattcchh to ignore up to that many lines in
looking for places to install a hunk. Note that a larger fuzz
Sets the maximum fuzz factor. This option only applies to
context diffs, and causes ppaattcchh to ignore up to that many lines
in looking for places to install a hunk. Note that a larger fuzz
factor increases the odds of a faulty patch. The default fuzz
factor is 2, and it may not be set to more than the number of
lines of context in the context diff, ordinarily 3.
--ff, ----ffoorrccee
Forces ppaattcchh to assume that the user knows exactly what he or she
is doing, and to not ask any questions. It assumes the follow-
ing: skip patches for which a file to patch can't be found; patch
files even though they have the wrong version for the "Prereq:"
line in the patch; and assume that patches are not reversed even
if they look like they are. This option does not suppress com-
mentary; use --ss for that.
is doing, and to not ask any questions. It assumes the
following: skip patches for which a file to patch can't be found;
patch files even though they have the wrong version for the
"Prereq:" line in the patch; and assume that patches are not
reversed even if they look like they are. This option does not
suppress commentary; use --ss for that.
--ii _p_a_t_c_h_f_i_l_e, ----iinnppuutt _p_a_t_c_h_f_i_l_e
Causes the next argument to be interpreted as the input file name
(i.e. a patchfile). This option may be specified multiple times.
(i.e., a patchfile). This option may be specified multiple
times.
--ll, ----iiggnnoorree--wwhhiitteessppaaccee
Causes the pattern matching to be done loosely, in case the tabs
@@ -132,10 +134,10 @@ DDEESSCCRRIIPPTTIIOONN
Not specifying --pp at all just gives you _b_l_u_r_f_l_._c, unless all of
the directories in the leading path (_u_/_h_o_w_a_r_d_/_s_r_c_/_b_l_u_r_f_l) exist
and that path is relative, in which case you get the entire path-
name unmodified. Whatever you end up with is looked for either
in the current directory, or the directory specified by the --dd
option.
and that path is relative, in which case you get the entire
pathname unmodified. Whatever you end up with is looked for
either in the current directory, or the directory specified by
the --dd option.
--RR, ----rreevveerrssee
Tells ppaattcchh that this patch was created with the old and new
@@ -151,7 +153,7 @@ DDEESSCCRRIIPPTTIIOONN
asked if you want to have the --RR option set. If it can't, the
patch will continue to be applied normally. (Note: this method
cannot detect a reversed patch if it is a normal diff and if the
first command is an append (i.e. it should have been a delete)
first command is an append (i.e., it should have been a delete)
since appends always succeed, due to the fact that a null context
will match anywhere. Luckily, most patches add or change lines
rather than delete them, so most reversed normal diffs will begin
@@ -175,9 +177,9 @@ DDEESSCCRRIIPPTTIIOONN
Forces ppaattcchh to interpret the patch file as a unified context
diff (a unidiff).
--VV tt | nniill | nneevveerr, ----vveerrssiioonn--ccoonnttrrooll tt | nniill | nneevveerr
Causes the next argument to be interpreted as a method for creat-
ing backup file names. The type of backups made can also be
--VV tt | nniill | nneevveerr | nnoonnee, ----vveerrssiioonn--ccoonnttrrooll tt | nniill | nneevveerr | nnoonnee
Causes the next argument to be interpreted as a method for
creating backup file names. The type of backups made can also be
given in the PATCH_VERSION_CONTROL or VERSION_CONTROL environment
variables, which are overridden by this option. The --BB option
overrides this option, causing the prefix to always be used for
@@ -198,6 +200,8 @@ DDEESSCCRRIIPPTTIIOONN
nneevveerr, ssiimmppllee
Always make simple backups.
nnoonnee No backups are created.
--vv, ----vveerrssiioonn
Causes ppaattcchh to print out its revision header and patch level.
@@ -206,24 +210,24 @@ DDEESSCCRRIIPPTTIIOONN
patchers.
--zz _b_a_c_k_u_p_-_e_x_t, ----ssuuffffiixx _b_a_c_k_u_p_-_e_x_t
Causes the next argument to be interpreted as the backup exten-
sion, to be used in place of ".orig".
Causes the next argument to be interpreted as the backup
extension, to be used in place of ".orig".
----ppoossiixx
Enables strict IEEE Std 1003.1-2004 (``POSIX.1'') conformance,
specifically:
1. Backup files are not created unless the --bb option is speci-
fied.
1. Backup files are not created unless the --bb option is
specified.
2. If unspecified, the file name used is the first of the old,
new and index files that exists.
PPaattcchh AApppplliiccaattiioonn
ppaattcchh will try to skip any leading garbage, apply the diff, and then skip
any trailing garbage. Thus you could feed an article or message contain-
ing a diff listing to ppaattcchh, and it should work. If the entire diff is
indented by a consistent amount, this will be taken into account.
any trailing garbage. Thus you could feed an article or message
containing a diff listing to ppaattcchh, and it should work. If the entire
diff is indented by a consistent amount, this will be taken into account.
With context diffs, and to a lesser extent with normal diffs, ppaattcchh can
detect when the line numbers mentioned in the patch are incorrect, and
@@ -234,18 +238,18 @@ DDEESSCCRRIIPPTTIIOONN
of lines matching the context given in the hunk. First ppaattcchh looks for a
place where all lines of the context match. If no such place is found,
and it's a context diff, and the maximum fuzz factor is set to 1 or more,
then another scan takes place ignoring the first and last line of con-
text. If that fails, and the maximum fuzz factor is set to 2 or more,
then another scan takes place ignoring the first and last line of
context. If that fails, and the maximum fuzz factor is set to 2 or more,
the first two and last two lines of context are ignored, and another scan
is made. (The default maximum fuzz factor is 2.)
If ppaattcchh cannot find a place to install that hunk of the patch, it will
put the hunk out to a reject file, which normally is the name of the out-
put file plus ".rej". (Note that the rejected hunk will come out in con-
text diff form whether the input patch was a context diff or a normal
put the hunk out to a reject file, which normally is the name of the
output file plus ".rej". (Note that the rejected hunk will come out in
context diff form whether the input patch was a context diff or a normal
diff. If the input was a normal diff, many of the contexts will simply
be null.) The line numbers on the hunks in the reject file may be dif-
ferent than in the patch file: they reflect the approximate location
be null.) The line numbers on the hunks in the reject file may be
different than in the patch file: they reflect the approximate location
patch thinks the failed hunks belong in the new file rather than the old
one.
@@ -268,11 +272,12 @@ DDEESSCCRRIIPPTTIIOONN
If the diff is a context or unified diff, ppaattcchh is able to determine the
old and new file names from the diff header. For context diffs, the
``old'' file is specified in the line beginning with "***" and the
``new'' file is specified in the line beginning with "---". For a uni-
fied diff, the ``old'' file is specified in the line beginning with "---"
and the ``new'' file is specified in the line beginning with "+++". If
there is an "Index:" line in the leading garbage (regardless of the diff
type), ppaattcchh will use the file name from that line as the ``index'' file.
``new'' file is specified in the line beginning with "---". For a
unified diff, the ``old'' file is specified in the line beginning with
"---" and the ``new'' file is specified in the line beginning with "+++".
If there is an "Index:" line in the leading garbage (regardless of the
diff type), ppaattcchh will use the file name from that line as the ``index''
file.
ppaattcchh will choose the file name by performing the following steps, with
the first match used:
@@ -286,9 +291,8 @@ DDEESSCCRRIIPPTTIIOONN
length (in that order).
2. If no file exists, ppaattcchh checks for the existence of the files in an
SCCS or RCS directory (using the appropriate prefix or suffix) using
the criteria specified above. If found, ppaattcchh will attempt to get
or check out the file.
RCS directory using the criteria specified above. If found, ppaattcchh
will attempt to get or check out the file.
3. If no suitable file was found to patch, the patch file is a context
or unified diff, and the old file was zero length, the new file name
@@ -307,15 +311,15 @@ DDEESSCCRRIIPPTTIIOONN
| patch -d /usr/src/local/blurfl
and patch a file in the blurfl directory directly from the article con-
taining the patch.
and patch a file in the blurfl directory directly from the article
containing the patch.
BBaacckkuupp FFiilleess
By default, the patched version is put in place of the original, with the
original file backed up to the same name with the extension ".orig", or
as specified by the --BB, --VV, or --zz options. The extension used for making
backup files may also be specified in the SIMPLE_BACKUP_SUFFIX environ-
ment variable, which is overridden by the options above.
backup files may also be specified in the SIMPLE_BACKUP_SUFFIX
environment variable, which is overridden by the options above.
If the backup file is a symbolic or hard link to the original file, ppaattcchh
creates a new backup file name by changing the first lowercase letter in
@@ -336,10 +340,10 @@ DDEESSCCRRIIPPTTIIOONN
patch file you send out. If you put a "Prereq:" line in with the patch,
it won't let them apply patches out of order without some warning.
Second, make sure you've specified the file names right, either in a con-
text diff header, or with an "Index:" line. If you are patching some-
thing in a subdirectory, be sure to tell the patch user to specify a --pp
option as needed.
Second, make sure you've specified the file names right, either in a
context diff header, or with an "Index:" line. If you are patching
something in a subdirectory, be sure to tell the patch user to specify a
--pp option as needed.
Third, you can create a file by sending out a diff that compares a null
file to the file you want to create. This will only work if the file you
@@ -349,8 +353,8 @@ DDEESSCCRRIIPPTTIIOONN
wonder whether they already applied the patch.
Fifth, while you may be able to get away with putting 582 diff listings
into one file, it is probably wiser to group related patches into sepa-
rate files in case something goes haywire.
into one file, it is probably wiser to group related patches into
separate files in case something goes haywire.
EENNVVIIRROONNMMEENNTT
POSIXLY_CORRECT When set, ppaattcchh behaves as if the ----ppoossiixx option
@@ -363,8 +367,8 @@ EENNVVIIRROONNMMEENNTT
VERSION_CONTROL Same as PATCH_VERSION_CONTROL.
FFIILLEESS
$TMPDIR/patch* ppaattcchh temporary files
/dev/tty used to read input when ppaattcchh prompts the user
_$_T_M_P_D_I_R_/_p_a_t_c_h_* ppaattcchh temporary files
_/_d_e_v_/_t_t_y used to read input when ppaattcchh prompts the user
DDIIAAGGNNOOSSTTIICCSS
Too many to list here, but generally indicative that ppaattcchh couldn't parse
@@ -391,8 +395,8 @@ SSTTAANNDDAARRDDSS
(``POSIX.1'') specification (except as detailed above for the ----ppoossiixx
option), though the presence of ppaattcchh itself is optional.
The flags [--CCEEffssttuuvvBBFFVVxxzz] and [----ppoossiixx] are extensions to that specifica-
tion.
The flags [--CCEEffssttuuvvBBFFVVxxzz] and [----ppoossiixx] are extensions to that
specification.
AAUUTTHHOORRSS
Larry Wall with many other contributors.
@@ -422,11 +426,11 @@ BBUUGGSS
If code has been duplicated (for instance with #ifdef OLDCODE ... #else
... #endif), ppaattcchh is incapable of patching both versions, and, if it
works at all, will likely patch the wrong one, and tell you that it suc-
ceeded to boot.
works at all, will likely patch the wrong one, and tell you that it
succeeded to boot.
If you apply a patch you've already applied, ppaattcchh will think it is a
reversed patch, and offer to un-apply the patch. This could be construed
as a feature.
NetBSD 5.0 August 18, 2008 NetBSD 5.0
NetBSD 7.0 November 7, 2015 NetBSD 7.0