--- pkgsrc/pkgtools/pkgdiff/files/patchdiff.1 2000/06/28 01:42:43 1.1 +++ pkgsrc/pkgtools/pkgdiff/files/patchdiff.1 2011/02/02 10:36:20 1.5 @@ -1,34 +1,53 @@ -.\" $NetBSD: patchdiff.1,v 1.1 2000/06/28 01:42:43 wiz Exp $ +.\" $NetBSD: patchdiff.1,v 1.5 2011/02/02 10:36:20 wiz Exp $ .\" -.\" Copyright (c) 2000 by Thomas Klausner -.\" All Rights Reserved. Absolutely no warranty. +.\" Copyright (c) 2000-2011 by Thomas Klausner +.\" All rights reserved. .\" -.Dd June 25, 2000 -.Dt patchdiff +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd January 31, 2011 +.Dt PATCHDIFF 1 .Os .Sh NAME .Nm patchdiff .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 existing patches with a new one created with .Xr mkpatches 1 . - +.Pp .Nm must be called from the package's main directory, that is -$PKGSRC/category/program. For each patch existing in either the -patches or the $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 ${PKGSRC}/category/program . +For each patch existing in either the +.Pa patches +directory, it is compared with its backup file +.Pq Pa patch-foo.orig +using .Xr diff 1 . -.Pp +If no relevant differences are found, the original patch is restored. .Sh SEE ALSO .Xr diff 1 , .Xr patchdiff 1 ,