diff options
Diffstat (limited to 'pkgtools/pkgdiff/files/patchdiff.1')
| -rw-r--r-- | pkgtools/pkgdiff/files/patchdiff.1 | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgtools/pkgdiff/files/patchdiff.1 b/pkgtools/pkgdiff/files/patchdiff.1 index 9f24f844f92..a5a7793d095 100644 --- a/pkgtools/pkgdiff/files/patchdiff.1 +++ b/pkgtools/pkgdiff/files/patchdiff.1 @@ -1,9 +1,9 @@ -.\" $NetBSD: patchdiff.1,v 1.3 2005/12/13 12:05:08 wiz Exp $ +.\" $NetBSD: patchdiff.1,v 1.4 2011/02/02 10:23:02 wiz Exp $ .\" -.\" Copyright (c) 2000 by Thomas Klausner <wiz@NetBSD.org> +.\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org> .\" All Rights Reserved. Absolutely no warranty. .\" -.Dd June 25, 2000 +.Dd January 31, 2011 .Dt PATCHDIFF 1 .Os .Sh NAME @@ -11,7 +11,6 @@ .Nd compare sets of patches .Sh SYNOPSIS .Nm -.Op Fl d Ar output-directory .Sh DESCRIPTION .Nm is a perl script that simplifies comparing a set of previously @@ -22,14 +21,12 @@ existing patches with a new one created with must be called from the package's main directory, that is .Pa ${PKGSRC}/category/program . For each patch existing in either the -patches or the -.Pa ${WRKDIR}/.newpatches -directory (the second of which can be overridden by the argument of the -.Fl d -option), a matching patch is -looked for in the other directory, and, if one is found, the two are -compared with +.Pa patches +directory, it is compared with its backup file +.Pq Pa patch-foo.orig +using .Xr diff 1 . +If no relevant differences are found, the original patch is restored. .Sh SEE ALSO .Xr diff 1 , .Xr patchdiff 1 , |