Initial import of idiff, the interactive front-end to diff(1), into

the packages collection.  idiff is taken from "The Unix Programming
Environment" by Brian Kernighan and Rob Pike (Prentice-Hall, 1984,
ISBN 0-13-937681-X).

7 files changed, 106 insertions, 0 deletions

diff --git a/devel/idiff/Makefile b/devel/idiff/Makefile
new file mode 100644
index 00000000000..885f08b68db
--- /dev/null
+++ b/devel/idiff/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/03/22 10:04:36 agc Exp $
+#
+
+DISTNAME=	idiff-1.0
+CATEGORIES=	devel
+MASTER_SITES=	http://www.darwinsys.com/freeware/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.darwinsys.com/freeware/
+COMMENT=	Interactive front-end to diff(1)
+
+do-install:
+	${BSD_INSTALL_PROGRAM} ${WRKSRC}/idiff ${PREFIX}/bin/idiff
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/idiff/files/md5 b/devel/idiff/files/md5
new file mode 100644
index 00000000000..decb8abf1d9
--- /dev/null
+++ b/devel/idiff/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2001/03/22 10:04:36 agc Exp $
+
+SHA1 (idiff-1.0.tar.gz) = 4d3f339184745a45747385bca6f559665c6136f8
diff --git a/devel/idiff/files/patch-sum b/devel/idiff/files/patch-sum
new file mode 100644
index 00000000000..79a749b1c4f
--- /dev/null
+++ b/devel/idiff/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1.1.1 2001/03/22 10:04:36 agc Exp $
+
+SHA1 (patch-aa) = 40b277adc2d1ee493669b2f9716e11a699de76f4
diff --git a/devel/idiff/patches/patch-aa b/devel/idiff/patches/patch-aa
new file mode 100644
index 00000000000..53406dfaa98
--- /dev/null
+++ b/devel/idiff/patches/patch-aa
@@ -0,0 +1,47 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/03/22 10:04:36 agc Exp $
+
+Don't overwrite read-only strings, so they can be placed in the text
+segment by a decent optimising compiler.
+
+--- idiff.c	2001/03/19 13:19:52	1.1
++++ idiff.c	2001/03/19 13:27:03
+@@ -1,5 +1,7 @@
+ /* idiff:  interactive diff */
+ 
++#include <sys/param.h>
++
+ #include <stdio.h>
+ #include <ctype.h>
+ char	*progname;
+@@ -11,6 +13,7 @@
+ {
+ 	FILE *fin, *fout, *f1, *f2, *efopen();
+ 	char buf[BUFSIZ], *mktemp();
++	char	realdiffname[MAXPATHLEN];
+ 	char *diffout = "idiff.XXXXXX";
+ 
+ 	progname = argv[0];
+@@ -21,6 +24,8 @@
+ 	f1 = efopen(argv[1], "r");
+ 	f2 = efopen(argv[2], "r");
+ 	fout = efopen("idiff.out", "w");
++	(void) strcpy(realdiffname, diffout);
++	diffout = realdiffname;
+ 	mktemp(diffout);
+ 	sprintf(buf,"diff %s %s >%s",argv[1],argv[2],diffout);
+ 	system(buf);
+@@ -34,11 +39,14 @@
+ idiff(f1, f2, fin, fout)	/* process diffs */
+ 	FILE *f1, *f2, *fin, *fout;
+ {
++	char	realtempfile[MAXPATHLEN];
+ 	char *tempfile = "idiff.XXXXXX";
+ 	char buf[BUFSIZ], buf2[BUFSIZ], *mktemp();
+ 	FILE *ft, *efopen();
+ 	int cmd, n, from1, to1, from2, to2, nf1, nf2;
+ 
++	(void) strcpy(realtempfile, tempfile);
++	tempfile = realtempfile;
+ 	mktemp(tempfile);
+ 	nf1 = nf2 = 0;
+ 	while (fgets(buf, sizeof buf, fin) != NULL) {
diff --git a/devel/idiff/pkg/DESCR b/devel/idiff/pkg/DESCR
new file mode 100644
index 00000000000..ad8b6705007
--- /dev/null
+++ b/devel/idiff/pkg/DESCR
@@ -0,0 +1,10 @@
+idiff is an interactive front-end to the diff(1) program.
+
+Taken from "The Unix Programming Environment" book, by Kernighan and
+Pike.
+
+When a difference is found, idiff gives you the opportunity to use the
+old portion ('<'), the new portion ('>') or to edit the difference via
+an editor. Shell escapes can also be made.
+
+Output is placed in the idiff.out file.
diff --git a/devel/idiff/pkg/MESSAGE b/devel/idiff/pkg/MESSAGE
new file mode 100644
index 00000000000..43db48953c8
--- /dev/null
+++ b/devel/idiff/pkg/MESSAGE
@@ -0,0 +1,26 @@
+These files contain all the code from The Unix Programming
+Environment, by Brian Kernighan and Rob Pike (Prentice-Hall,
+1984, ISBN 0-13-937681-X).  A separate hoc6 distribution contains
+any fixes that we have applied to that; the version in this file
+is from the book.
+
+Copyright (C) Lucent Technologies, 1997.  All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all
+copies and that both the copyright notice and this permission
+notice and warranty disclaimer appear in supporting
+documentation, and that the name of Lucent Technologies or any of
+its entities not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+LUCENT TECHNOLOGIES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS.  IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/devel/idiff/pkg/PLIST b/devel/idiff/pkg/PLIST
new file mode 100644
index 00000000000..79936f64f86
--- /dev/null
+++ b/devel/idiff/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/22 10:04:36 agc Exp $
+bin/idiff