summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2004-04-11 21:35:21 +0000
committerjschauma <jschauma@pkgsrc.org>2004-04-11 21:35:21 +0000
commit1d366a42152bbbc6d80f2f210d34bb4e0da3fff1 (patch)
treefb564918d5e622b5a83f559d3e966eca60e0fa7e
parentbdfa614b826ee64f468fe4ec25ad0bdc4ae734e2 (diff)
downloadpkgsrc-1d366a42152bbbc6d80f2f210d34bb4e0da3fff1.tar.gz
Add pre-generated .0 manpages; only regen under SunOS or AIX.
-rw-r--r--pkgtools/pkgdiff/Makefile9
-rw-r--r--pkgtools/pkgdiff/files/mkpatches.027
-rw-r--r--pkgtools/pkgdiff/files/patchdiff.023
-rw-r--r--pkgtools/pkgdiff/files/pkgdiff.027
-rw-r--r--pkgtools/pkgdiff/files/pkgvi.032
5 files changed, 115 insertions, 3 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 10886f86eaf..bf0002e9a65 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/02/10 23:53:33 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2004/04/11 21:35:21 jschauma Exp $
#
DISTNAME= pkgdiff-0.113
@@ -33,7 +33,6 @@ DEPENDS+= diffutils-[0-9]*:../../devel/diffutils
DIFF?= gdiff
MANINSTALL=
.else
-NROFF= nroff
DIFF?= diff
.endif
@@ -60,7 +59,11 @@ do-build:
${CP} ${FILESDIR}/pkgvi ${WRKSRC}
.if !empty(MANINSTALL:Mcatinstall)
. for FILE in mkpatches patchdiff pkgdiff pkgvi
- ${NROFF} -mandoc ${FILESDIR}/${FILE}.1 >${WRKSRC}/${FILE}.0
+. if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
+ nroff -man ${FILESDIR}/${FILE}.1 >${WRKSRC}/${FILE}.0
+. else
+ ${CP} ${FILESDIR}/${FILE}.0 ${WRKSRC}/${FILE}.0
+. endif
. endfor
.endif
diff --git a/pkgtools/pkgdiff/files/mkpatches.0 b/pkgtools/pkgdiff/files/mkpatches.0
new file mode 100644
index 00000000000..1b4fe532c03
--- /dev/null
+++ b/pkgtools/pkgdiff/files/mkpatches.0
@@ -0,0 +1,27 @@
+MKPATCHES(1) NetBSD General Commands Manual MKPATCHES(1)
+
+NNAAMMEE
+ mmkkppaattcchheess - create patch files appropriate for pkgsrc
+
+SSYYNNOOPPSSIISS
+ mmkkppaattcchheess [--dd _o_u_t_p_u_t_-_d_i_r_e_c_t_o_r_y]
+
+DDEESSCCRRIIPPTTIIOONN
+ mmkkppaattcchheess 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''.
+
+ mmkkppaattcchheess must be called from the package's main directory, that is
+ _$_{_P_K_G_S_R_C_}_/_c_a_t_e_g_o_r_y_/_p_r_o_g_r_a_m. 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
+ pkgdiff(1).
+
+ The resulting patches are saved in the directory _$_{_W_R_K_D_I_R_}_/_._n_e_w_p_a_t_c_h_e_s or
+ the directory specified after --dd, and can be easily compared to the cur-
+ rently existing set using patchdiff(1).
+
+SSEEEE AALLSSOO
+ patchdiff(1), pkgdiff(1)
+
+NetBSD 1.6 June 25, 2000 NetBSD 1.6
diff --git a/pkgtools/pkgdiff/files/patchdiff.0 b/pkgtools/pkgdiff/files/patchdiff.0
new file mode 100644
index 00000000000..3e22cf780f9
--- /dev/null
+++ b/pkgtools/pkgdiff/files/patchdiff.0
@@ -0,0 +1,23 @@
+PATCHDIFF(1) NetBSD General Commands Manual PATCHDIFF(1)
+
+NNAAMMEE
+ ppaattcchhddiiffff - compare sets of patches
+
+SSYYNNOOPPSSIISS
+ ppaattcchhddiiffff [--dd _o_u_t_p_u_t_-_d_i_r_e_c_t_o_r_y]
+
+DDEESSCCRRIIPPTTIIOONN
+ ppaattcchhddiiffff is a perl script that simplifies comparing a set of previously
+ existing patches with a new one created with mkpatches(1).
+
+ ppaattcchhddiiffff must be called from the package's main directory, that is
+ _$_{_P_K_G_S_R_C_}_/_c_a_t_e_g_o_r_y_/_p_r_o_g_r_a_m. For each patch existing in either the
+ patches or the _$_{_W_R_K_D_I_R_}_/_._n_e_w_p_a_t_c_h_e_s directory (the second of which can
+ be overridden by the argument of the --dd option), a matching patch is
+ looked for in the other directory, and, if one is found, the two are com-
+ pared with diff(1).
+
+SSEEEE AALLSSOO
+ diff(1), patchdiff(1), pkgdiff(1)
+
+NetBSD 1.6 June 25, 2000 NetBSD 1.6
diff --git a/pkgtools/pkgdiff/files/pkgdiff.0 b/pkgtools/pkgdiff/files/pkgdiff.0
new file mode 100644
index 00000000000..67fad329896
--- /dev/null
+++ b/pkgtools/pkgdiff/files/pkgdiff.0
@@ -0,0 +1,27 @@
+PKGDIFF(1) NetBSD General Commands Manual PKGDIFF(1)
+
+NNAAMMEE
+ ppkkggddiiffff - diff files in a way appropriate for pkgsrc
+
+SSYYNNOOPPSSIISS
+ ppkkggddiiffff [_o_p_t_i_o_n_s] _o_l_d_f_i_l_e _n_e_w_f_i_l_e
+
+DDEESSCCRRIIPPTTIIOONN
+ The ppkkggddiiffff utility runs 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 first, and some effort is made to ensure
+ that the generated patch does not include any RCS IDs.
+
+ _o_p_t_i_o_n_s can be any options that are allowed for diff(1).
+
+EENNVVIIRROONNMMEENNTT
+ PPKKGGDDIIFFFF__FFMMTT
+ The flags passed to diff(1) when generating patches. If not set, the
+ flags --uu and --pp are used. Though only unified format patches are used in
+ pkgsrc as proper patches, sometimes it can be useful to have context or
+ plain diffs available.
+
+SSEEEE AALLSSOO
+ cvs(1), diff(1), mkpatches(1), patch(1), pkgvi(1)
+
+NetBSD 1.6 Jun 14, 2003 NetBSD 1.6
diff --git a/pkgtools/pkgdiff/files/pkgvi.0 b/pkgtools/pkgdiff/files/pkgvi.0
new file mode 100644
index 00000000000..6021813b23c
--- /dev/null
+++ b/pkgtools/pkgdiff/files/pkgvi.0
@@ -0,0 +1,32 @@
+PKGVI(1) NetBSD General Commands Manual PKGVI(1)
+
+NNAAMMEE
+ ppkkggvvii - run editor and make backup of given file if necessary
+
+SSYYNNOOPPSSIISS
+ ppkkggvvii [+command] _f_i_l_e
+
+DDEESSCCRRIIPPTTIIOONN
+ The ppkkggvvii utility runs the user's favourite editor on a copy of specified
+ file. If no changes are made in the editor, nothing happens. Else the
+ original file is kept as _f_i_l_e_n_a_m_e_._o_r_i_g, and the modified file is saved as
+ _f_i_l_e_n_a_m_e. If ppkkggvvii finds _f_i_l_e_n_a_m_e_._o_r_i_g, it behaves as normal editor and
+ changes are only made to _f_i_l_e_n_a_m_e, not affecting _f_i_l_e_n_a_m_e_._o_r_i_g.
+
+ Available option:
+
+ ++ccoommmmaanndd
+ This option is passed unmodified as first argument to the editor.
+ This is useful when the editor used is vi(1).
+
+EENNVVIIRROONNMMEENNTT
+ ppkkggvvii uses $PKGEDITOR if defined, then it looks for $EDITOR, if neither
+ is defined, it uses vi(1).
+
+SSEEEE AALLSSOO
+ pkgdiff(1)
+
+AAUUTTHHOORRSS
+ The pkgvi utility was written by Tomasz Luchowski <zuntum@netbsd.org>.
+
+NetBSD 1.6 May 28, 2003 NetBSD 1.6