initial import of patchutils-0.2.30

Patchutils is a small collection of programs that operate on patch files.
Interdiff generates an incremental patch from two patches against a common
source. For example, if you have applied a pre-patch to a source tree, and
wish to apply another pre-patch (which is against the same original source
tree), you can use interdiff to generate the patch that you need to apply.
You can also use this to review changes between two pre-patches.
Combinediff generates a single patch from two incremental patches, allowing
you to merge patches together. The resulting patch file only alters each file
once.
Filterdiff will select the portions of a patch file that apply to files
matching (or, alternatively, not matching) a shell wildcard.
Fixcvsdiff is for correcting the output of 'cvs diff'.
Rediff corrects hand-edited patches, by comparing the original patch with the
modified one and adjusting the offsets and counts.
Lsdiff displays a short listing of affected files in a patch file, along with
(optionally) the line numbers of the start of each patch.
Splitdiff separates out patches from a patch file so that each new patch file
only alters any given file once. In this way, a file containing several
incremental patches can be split into individual incremental patches.
Grepdiff displays a list of the files modified by a patch where the patch
contains a given regular expression.
Recountdiff fixes up counts and offsets in a unified diff.
Unwrapdiff fixes word-wrapped unified diffs.

4 files changed, 77 insertions, 0 deletions

diff --git a/devel/patchutils/DESCR b/devel/patchutils/DESCR
new file mode 100644
index 00000000000..f35a5d170bd
--- /dev/null
+++ b/devel/patchutils/DESCR
@@ -0,0 +1,23 @@
+Patchutils is a small collection of programs that operate on patch files.
+Interdiff generates an incremental patch from two patches against a common
+source. For example, if you have applied a pre-patch to a source tree, and
+wish to apply another pre-patch (which is against the same original source
+tree), you can use interdiff to generate the patch that you need to apply.
+You can also use this to review changes between two pre-patches.
+Combinediff generates a single patch from two incremental patches, allowing
+you to merge patches together. The resulting patch file only alters each file
+once.
+Filterdiff will select the portions of a patch file that apply to files
+matching (or, alternatively, not matching) a shell wildcard.
+Fixcvsdiff is for correcting the output of 'cvs diff'.
+Rediff corrects hand-edited patches, by comparing the original patch with the
+modified one and adjusting the offsets and counts.
+Lsdiff displays a short listing of affected files in a patch file, along with
+(optionally) the line numbers of the start of each patch.
+Splitdiff separates out patches from a patch file so that each new patch file
+only alters any given file once. In this way, a file containing several
+incremental patches can be split into individual incremental patches.
+Grepdiff displays a list of the files modified by a patch where the patch
+contains a given regular expression.
+Recountdiff fixes up counts and offsets in a unified diff.
+Unwrapdiff fixes word-wrapped unified diffs.
diff --git a/devel/patchutils/Makefile b/devel/patchutils/Makefile
new file mode 100644
index 00000000000..ccc09a98306
--- /dev/null
+++ b/devel/patchutils/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/07/24 08:45:26 recht Exp $
+#
+
+DISTNAME=		patchutils-0.2.30
+CATEGORIES=		devel
+MASTER_SITES=		http://cyberelk.net/tim/data/patchutils/stable/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		recht@NetBSD.org
+HOMEPAGE=		http://cyberelk.net/tim/patchutils/index.html
+COMMENT=		Some programs for manipulating patch files
+
+DEPENDS+=               patch-[0-9]*:../../devel/patch
+
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/patchutils/PLIST b/devel/patchutils/PLIST
new file mode 100644
index 00000000000..4f7aa55d0bd
--- /dev/null
+++ b/devel/patchutils/PLIST
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/24 08:45:27 recht Exp $
+bin/combinediff
+bin/dehtmldiff
+bin/editdiff
+bin/espdiff
+bin/filterdiff
+bin/fixcvsdiff
+bin/flipdiff
+bin/grepdiff
+bin/interdiff
+bin/lsdiff
+bin/recountdiff
+bin/rediff
+bin/splitdiff
+bin/unwrapdiff
+man/man1/combinediff.1
+man/man1/dehtmldiff.1
+man/man1/editdiff.1
+man/man1/espdiff.1
+man/man1/filterdiff.1
+man/man1/fixcvsdiff.1
+man/man1/flipdiff.1
+man/man1/grepdiff.1
+man/man1/interdiff.1
+man/man1/lsdiff.1
+man/man1/recountdiff.1
+man/man1/rediff.1
+man/man1/splitdiff.1
+man/man1/unwrapdiff.1
diff --git a/devel/patchutils/distinfo b/devel/patchutils/distinfo
new file mode 100644
index 00000000000..018cd3c7e3e
--- /dev/null
+++ b/devel/patchutils/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/07/24 08:45:27 recht Exp $
+
+SHA1 (patchutils-0.2.30.tar.bz2) = 9330c7c94c7a3f36c8f0c4323fb39a16df038f02
+Size (patchutils-0.2.30.tar.bz2) = 147722 bytes