summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2001-10-18 10:23:36 +0000
committeragc <agc@pkgsrc.org>2001-10-18 10:23:36 +0000
commit1e334931a0fd5ef2b591921042737659eddc1796 (patch)
treecae6bfe33ef86a7b4017c415b885df708f70e4b7 /devel
parentfcbff59015f2c8cea36e99e070e52bb207f06c64 (diff)
downloadpkgsrc-1e334931a0fd5ef2b591921042737659eddc1796.tar.gz
Initial import of unidiff-1.0 into the NetBSD Packages Collection.
Unify will accept either a regular context diff (old- or new-style) or a unified context diff as input, and generate either a unified diff or a new-style context diff as output. The default is to output the opposite style of whatever was input, but this can be overridden by the -c or -u options. If the source file is not mentioned, it will be read from the standard input. Various other options allow you to echo the non-diff (comment) lines to stderr, modify the diff by removing the comment lines, and/or tweak the diff into a format that is good for releasing patches. Unipatch is a filter to turn a unified diff into a degenerate context diff (no '!'s) for patch. With thanks to Alan Barrett for the nudge.
Diffstat (limited to 'devel')
-rw-r--r--devel/unidiff/Makefile24
-rw-r--r--devel/unidiff/distinfo4
-rw-r--r--devel/unidiff/pkg/DESCR13
-rw-r--r--devel/unidiff/pkg/PLIST4
4 files changed, 45 insertions, 0 deletions
diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile
new file mode 100644
index 00000000000..3ff60bf8bc5
--- /dev/null
+++ b/devel/unidiff/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/10/18 10:23:36 agc Exp $
+#
+
+DISTNAME= part01
+PKGNAME= unidiff-1.0
+CATEGORIES= devel
+MASTER_SITES= http://www.landfield.com/software/comp.sources.misc/archive-name/volume25/unidiff/
+EXTRACT_SUFX= .gz
+
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= #
+COMMENT= converts between uni-diffs and context diffs
+
+BUILD_DEPENDS= gsharutils-4.2.1:../../archivers/gsharutils
+
+EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | gunshar
+WRKSRC= ${WRKDIR}
+
+do-install:
+ ${BSD_INSTALL_PROGRAM} ${WRKSRC}/unify ${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} ${WRKSRC}/unipatch ${PREFIX}/bin
+ ${BSD_INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/man/man1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/unidiff/distinfo b/devel/unidiff/distinfo
new file mode 100644
index 00000000000..82d8ea71a5e
--- /dev/null
+++ b/devel/unidiff/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/10/18 10:23:36 agc Exp $
+
+SHA1 (part01.gz) = 1ea5bb6d48c68853a5517b5f9fa29ad03d9f4f4d
+Size (part01.gz) = 6794 bytes
diff --git a/devel/unidiff/pkg/DESCR b/devel/unidiff/pkg/DESCR
new file mode 100644
index 00000000000..5e2d49f3ae7
--- /dev/null
+++ b/devel/unidiff/pkg/DESCR
@@ -0,0 +1,13 @@
+Unify will accept either a regular context diff (old- or new-style) or
+a unified context diff as input, and generate either a unified diff or
+a new-style context diff as output. The default is to output the
+opposite style of whatever was input, but this can be overridden by
+the -c or -u options. If the source file is not mentioned, it will be
+read from the standard input.
+
+Various other options allow you to echo the non-diff (comment) lines
+to stderr, modify the diff by removing the comment lines, and/or tweak
+the diff into a format that is good for releasing patches.
+
+Unipatch is a filter to turn a unified diff into a degenerate context
+diff (no '!'s) for patch.
diff --git a/devel/unidiff/pkg/PLIST b/devel/unidiff/pkg/PLIST
new file mode 100644
index 00000000000..ddf4f069411
--- /dev/null
+++ b/devel/unidiff/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/10/18 10:23:36 agc Exp $
+bin/unify
+bin/unipatch
+man/man1/unify.1