summaryrefslogtreecommitdiff
path: root/pkgtools/pkgdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-12-03 19:03:19 +0000
committerwiz <wiz@pkgsrc.org>2001-12-03 19:03:19 +0000
commitb4f0a668fa0041bdd4f700917762a64854abd442 (patch)
treeb1dba1934d8e474a3e6946d57aef51d6abcb1540 /pkgtools/pkgdiff
parentbf1895f0b4ea7e92a31395a74170ce7fad30b048 (diff)
downloadpkgsrc-b4f0a668fa0041bdd4f700917762a64854abd442.tar.gz
Miscellaneous man page fixes.
Diffstat (limited to 'pkgtools/pkgdiff')
-rw-r--r--pkgtools/pkgdiff/files/mkpatches.126
-rw-r--r--pkgtools/pkgdiff/files/patchdiff.115
-rw-r--r--pkgtools/pkgdiff/files/pkgdiff.121
-rw-r--r--pkgtools/pkgdiff/files/pkgvi.127
4 files changed, 50 insertions, 39 deletions
diff --git a/pkgtools/pkgdiff/files/mkpatches.1 b/pkgtools/pkgdiff/files/mkpatches.1
index 24f87af8b2a..4e75f2ca82b 100644
--- a/pkgtools/pkgdiff/files/mkpatches.1
+++ b/pkgtools/pkgdiff/files/mkpatches.1
@@ -1,10 +1,10 @@
-.\" $NetBSD: mkpatches.1,v 1.1.1.1 2000/06/28 01:42:43 wiz Exp $
+.\" $NetBSD: mkpatches.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
.\"
.\" Copyright (c) 2000 by Thomas Klausner <wiz@netbsd.org>
.\" All Rights Reserved. Absolutely no warranty.
.\"
.Dd June 25, 2000
-.Dt mkpatches
+.Dt MKPATCHES 1
.Os
.Sh NAME
.Nm mkpatches
@@ -16,21 +16,27 @@
.Nm
is a perl script that simplifies creating patches from a changed work
tree if for each changed file the original was kept with an added
-extension '.orig'.
-
+extension
+.Dq .orig .
+.Pp
.Nm
must be called from the package's main directory, that is
-$PKGSRC/category/program. It then proceeds to find all files that
-match the pattern '*.orig'. Each of these is then compared to the
-changed file of the same name (with no '.orig' extension) using
+.Pa ${PKGSRC}/category/program .
+It then proceeds to find all files that
+match the pattern
+.Dq *.orig .
+Each of these is then compared to the
+changed file of the same name (with no
+.Dq .orig
+extension) using
.Xr pkgdiff 1 .
-
-The resulting patches are saved in the directory $WRKDIR/.newpatches
+.Pp
+The resulting patches are saved in the directory
+.Pa ${WRKDIR}/.newpatches
or the directory specified after
.Fl d ,
and can be easily compared to the currently existing set using
.Xr patchdiff 1 .
-.Pp
.Sh SEE ALSO
.Xr patchdiff 1 ,
.Xr pkgdiff 1
diff --git a/pkgtools/pkgdiff/files/patchdiff.1 b/pkgtools/pkgdiff/files/patchdiff.1
index c12db91e81d..9ccb3c557e3 100644
--- a/pkgtools/pkgdiff/files/patchdiff.1
+++ b/pkgtools/pkgdiff/files/patchdiff.1
@@ -1,10 +1,10 @@
-.\" $NetBSD: patchdiff.1,v 1.1.1.1 2000/06/28 01:42:43 wiz Exp $
+.\" $NetBSD: patchdiff.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
.\"
.\" Copyright (c) 2000 by Thomas Klausner <wiz@netbsd.org>
.\" All Rights Reserved. Absolutely no warranty.
.\"
.Dd June 25, 2000
-.Dt patchdiff
+.Dt PATCHDIFF 1
.Os
.Sh NAME
.Nm patchdiff
@@ -17,18 +17,19 @@
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
+.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
.Xr diff 1 .
-.Pp
.Sh SEE ALSO
.Xr diff 1 ,
.Xr patchdiff 1 ,
diff --git a/pkgtools/pkgdiff/files/pkgdiff.1 b/pkgtools/pkgdiff/files/pkgdiff.1
index 8af3a92f480..f4435816a5f 100644
--- a/pkgtools/pkgdiff/files/pkgdiff.1
+++ b/pkgtools/pkgdiff/files/pkgdiff.1
@@ -1,32 +1,37 @@
-.\" $NetBSD: pkgdiff.1,v 1.2 2001/06/13 17:50:31 zuntum Exp $
+.\" $NetBSD: pkgdiff.1,v 1.3 2001/12/03 19:03:22 wiz Exp $
.\"
.\" Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org>
.\" All Rights Reserved. Absolutely no warranty.
.\"
.Dd May 14, 2000
-.Dt pkgdiff
+.Dt PKGDIFF 1
.Os
.Sh NAME
.Nm pkgdiff
.Nd diff files in a way appropriate for pkgsrc
.Sh SYNOPSIS
.Nm
-.Op Ar diff(1) options
+.Op Ar options
.Ar oldfile
.Ar newfile
.Sh DESCRIPTION
-The
+The
.Nm
-utility runs
+utility runs
.Xr diff 1
on the named files, and generates output on stdout that is appropriate
-to be put as patch file into pkgsrc. An empty NetBSD RCS ID is output
+to be put as patch file into pkgsrc. An empty
+.Nx
+RCS ID is output
first, and some effort is made to ensure that the generated patch does
not include any RCS IDs.
.Pp
+.Ar options
+can be any options that are allowed for
+.Xr diff 1 .
.Sh SEE ALSO
-.Xr pkgvi 1 ,
.Xr cvs 1 ,
.Xr diff 1 ,
.Xr mkpatches 1 ,
-.Xr patch 1
+.Xr patch 1 ,
+.Xr pkgvi 1
diff --git a/pkgtools/pkgdiff/files/pkgvi.1 b/pkgtools/pkgdiff/files/pkgvi.1
index dc12730507d..82b9d47ae32 100644
--- a/pkgtools/pkgdiff/files/pkgvi.1
+++ b/pkgtools/pkgdiff/files/pkgvi.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkgvi.1,v 1.4 2001/10/31 07:58:20 zuntum Exp $
+.\" $NetBSD: pkgvi.1,v 1.5 2001/12/03 19:03:23 wiz Exp $
.\"
.\" Copyright (c) 2001 Tomasz Luchowski. All rights reserved.
.\"
@@ -12,7 +12,7 @@
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
-.\" This product includes software developed by Tomasz Luchowski
+.\" This product includes software developed by Tomasz Luchowski
.\" for the NetBSD Project
.\" 4. The name of the author may not be used to endorse or promote products
.\" derived from this software without specific prior written permission.
@@ -29,9 +29,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-
-.Dd Jan 17, 2001
-.Dt pkgvi 1
+.Dd January 17, 2001
+.Dt PKGVI 1
.Os
.Sh NAME
.Nm pkgvi
@@ -41,7 +40,7 @@
.Ar file
.Sh DESCRIPTION
The
-.Nm
+.Nm
utility runs the user's favourite editor
on a copy of specified file.
If no changes are made in the editor, nothing happens.
@@ -49,22 +48,22 @@ Else the original file is kept as
.Pa filename.orig ,
and the modified file
is saved as
-.Pa filename.
-If
+.Pa filename .
+If
.Nm
finds
.Pa filename.orig ,
-it behaves as normal editor and changes are only made to
+it behaves as normal editor and changes are only made to
.Pa filename ,
not affecting
.Pa filename.orig .
.Sh ENVIRONMENT
.Nm
uses $PKGEDITOR if defined, then it looks for $EDITOR,
-if neither is defined, it uses
+if neither is defined, it uses
.Xr vi 1 .
-.Pp
.Sh SEE ALSO
-.Xr pkgdiff 1 ,
-.Sh AUTHOR
-The pkgvi utility was written by Tomasz Luchowski <zuntum@netbsd.org>.
+.Xr pkgdiff 1
+.Sh AUTHORS
+The pkgvi utility was written by
+.An Tomasz Luchowski Aq zuntum@netbsd.org .