From 05a6ddff1af51cdd29670903cc5ce4e1179687d1 Mon Sep 17 00:00:00 2001 From: agc Date: Mon, 15 Oct 2001 10:12:08 +0000 Subject: Initial import of spiff-1.0 into the Packages Collection. Spiff compares the contents of file1 and file2 and prints a description of the important differences between the files. White space is ignored except to separate other objects. Spiff maintains tolerances below which differences between two floating point numbers are ignored. Differences in floating point notation (such as 3.4 3.40 and 3.4e01) are treated as unimportant. User specified delimited strings (i.e. comments) can also be ignored. Inside other user specified delimited strings (i.e. quoted strings) whitespace can be significant. Taken from a hint by Alan Barrett. --- devel/spiff/Makefile | 14 +++++++++++++ devel/spiff/distinfo | 7 +++++++ devel/spiff/patches/patch-aa | 50 ++++++++++++++++++++++++++++++++++++++++++++ devel/spiff/patches/patch-ab | 28 +++++++++++++++++++++++++ devel/spiff/patches/patch-ac | 28 +++++++++++++++++++++++++ devel/spiff/pkg/DESCR | 9 ++++++++ devel/spiff/pkg/PLIST | 3 +++ 7 files changed, 139 insertions(+) create mode 100644 devel/spiff/Makefile create mode 100644 devel/spiff/distinfo create mode 100644 devel/spiff/patches/patch-aa create mode 100644 devel/spiff/patches/patch-ab create mode 100644 devel/spiff/patches/patch-ac create mode 100644 devel/spiff/pkg/DESCR create mode 100644 devel/spiff/pkg/PLIST (limited to 'devel') diff --git a/devel/spiff/Makefile b/devel/spiff/Makefile new file mode 100644 index 00000000000..64589a9fc51 --- /dev/null +++ b/devel/spiff/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1 2001/10/15 10:12:08 agc Exp $ +# + +DISTNAME= spiff-1.0 +CATEGORIES= devel +MASTER_SITES= http://www.darwinsys.com/freeware/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.darwinsys.com/freeware/ +COMMENT= Make controlled approximate comparisons between files + +ALL_TARGET= spiff + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/spiff/distinfo b/devel/spiff/distinfo new file mode 100644 index 00000000000..f5f32f198e8 --- /dev/null +++ b/devel/spiff/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1.1.1 2001/10/15 10:12:08 agc Exp $ + +SHA1 (spiff-1.0.tar.gz) = 09803fa6f946c3639bb2c7ac5b5644860ebed643 +Size (spiff-1.0.tar.gz) = 48291 bytes +SHA1 (patch-aa) = 7385b723590f1e8ce86e830605da3ce1bd97a3ea +SHA1 (patch-ab) = 4bc7a5c5ea75f478248e52fa492e4cc0cd4ae201 +SHA1 (patch-ac) = d88280626b3d1621377d38037a52e79e6e35bb1a diff --git a/devel/spiff/patches/patch-aa b/devel/spiff/patches/patch-aa new file mode 100644 index 00000000000..dc9be2eaa26 --- /dev/null +++ b/devel/spiff/patches/patch-aa @@ -0,0 +1,50 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/10/15 10:12:08 agc Exp $ + +--- Makefile 2001/10/15 09:58:02 1.1 ++++ Makefile 2001/10/15 09:58:39 +@@ -7,7 +7,7 @@ + # name of the directory into which the binary should be installed + # used only when you use 'make install' + # +-INSDIR=/usr/local/bin ++INSDIR=${PREFIX} + + # + # choose one from each of 1) 2) and 3) below +@@ -18,21 +18,21 @@ + # choose a) b) or c) + # + # a) for BSD derivitives, enable the following line +-#OSFLAG= ++OSFLAG= + + # b) for XENIX systems, enable the following line + #OSFLAG=-DXENIX + + # b) for other A.T.&T. UNIX derivitives, enable the following line +-OSFLAG=-DATT ++#OSFLAG=-DATT + + # + # 2) SELECTION OF TERMINAL CONTROL LIBRARY + # choose either of a) b) or c) + # + # a) if you use termcap, enable the following lines +-#TFLAG=-DM_TERMCAP +-#TLIB=termcap ++TFLAG=-DM_TERMCAP ++TLIB=termcap + + # b) if you are using terminfo on a XENIX machine, enable the following lines + #TFLAG=-DM_TERMINFO +@@ -44,8 +44,8 @@ + #TLIB=curses + + # d) NONE OF THE ABOVE +-TFLAG= +-TLIB=m # just a link to mathlib; quick hack to avoid fixing Makefile ++#TFLAG= ++#TLIB=m # just a link to mathlib; quick hack to avoid fixing Makefile + + # + # 3) SELECTION OF WINDOW MANAGER AVAILABILITY diff --git a/devel/spiff/patches/patch-ab b/devel/spiff/patches/patch-ab new file mode 100644 index 00000000000..c6220d8ded5 --- /dev/null +++ b/devel/spiff/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.1.1.1 2001/10/15 10:12:08 agc Exp $ + +--- misc.h 2001/10/15 10:01:22 1.1 ++++ misc.h 2001/10/15 10:02:19 +@@ -8,6 +8,8 @@ + + #ifndef Z_INCLUDED + ++#include ++ + /* + ** make sure that if we have a XENIX system, that + ** we also treat it as an AT and T derivative +@@ -36,12 +38,14 @@ + /* + ** lines needed to shut up lint + */ ++#if !(defined(BSD) && BSD >= 199306) + extern char *sprintf(); + extern char *strcat(); + extern char *strncat(); + extern char *strcpy(); + extern char *strncpy(); + extern char *malloc(); ++#endif /* BSD */ + + extern void Z_complain(); + extern void Z_fatal(); diff --git a/devel/spiff/patches/patch-ac b/devel/spiff/patches/patch-ac new file mode 100644 index 00000000000..3a002135f01 --- /dev/null +++ b/devel/spiff/patches/patch-ac @@ -0,0 +1,28 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/10/15 10:12:08 agc Exp $ + +"inline" isn't acceptable as an identifier any more. + +--- command.c 2001/10/15 10:03:08 1.1 ++++ command.c 2001/10/15 10:03:39 +@@ -172,17 +172,17 @@ + } + + int +-C_is_cmd(inline) +-char *inline; ++C_is_cmd(in_line) ++char *in_line; + { + char *ptr; + /* + ** see if this is a command line + ** and if so, do the command right away + */ +- if (('\0' != _C_cmdword[0]) && (!S_wordcmp(inline,_C_cmdword))) ++ if (('\0' != _C_cmdword[0]) && (!S_wordcmp(in_line,_C_cmdword))) + { +- ptr = inline; ++ ptr = in_line; + S_nextword(&ptr); + _C_do_a_cmd(ptr); + return(1); diff --git a/devel/spiff/pkg/DESCR b/devel/spiff/pkg/DESCR new file mode 100644 index 00000000000..d4a883347e5 --- /dev/null +++ b/devel/spiff/pkg/DESCR @@ -0,0 +1,9 @@ +Spiff compares the contents of file1 and file2 and prints a +description of the important differences between the files. White +space is ignored except to separate other objects. Spiff maintains +tolerances below which differences between two floating point numbers +are ignored. Differences in floating point notation (such as 3.4 3.40 +and 3.4e01) are treated as unimportant. User specified delimited +strings (i.e. comments) can also be ignored. Inside other user +specified delimited strings (i.e. quoted strings) whitespace can be +significant. diff --git a/devel/spiff/pkg/PLIST b/devel/spiff/pkg/PLIST new file mode 100644 index 00000000000..526bf975554 --- /dev/null +++ b/devel/spiff/pkg/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2001/10/15 10:12:08 agc Exp $ +bin/spiff +man/man1/spiff.1 -- cgit v1.2.3