cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Simply install the source man page.

Browse Source 
* Add includes for prototypes.
* Fix a bizarre pointer to int as boolean abuse in parse.c.

ok ian@
This commit is contained in:
naddy 2011-07-03 22:55:26 +00:00
parent 003265780c
commit 07b052b52c
15 changed files with 163 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
textproc/spiff/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2010/11/20 19:56:52 espie Exp $
# $OpenBSD: Makefile,v 1.16 2011/07/03 22:55:26 naddy Exp $
COMMENT= very flexible diff-like program
DISTNAME= spiff-1.0
REVISION = 0
REVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.darwinsys.com/freeware/
@ -17,11 +17,10 @@ PERMIT_DISTFILES_CDROM= no fee
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
USE_GROFF = Yes
NO_REGRESS= Yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/spiff ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/spiff.0 ${PREFIX}/man/cat1
${INSTALL_MAN} ${WRKSRC}/spiff.1 ${PREFIX}/man/man1
.include <bsd.port.mk>

20
textproc/spiff/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1 2005/09/05 13:25:04 espie Exp $
$OpenBSD: patch-Makefile,v 1.2 2011/07/03 22:55:26 naddy Exp $
--- Makefile.orig Mon May 2 00:51:17 1994
+++ Makefile Mon Sep 5 15:22:50 2005
+++ Makefile Fri Jun 24 18:08:15 2011
@@ -18,21 +18,21 @@ INSDIR=/usr/local/bin
# choose a) b) or c)
#
@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.1 2005/09/05 13:25:04 espie Exp $
# b) if you are using terminfo on a XENIX machine, enable the following lines
#TFLAG=-DM_TERMINFO
@@ -75,14 +75,15 @@ OBJ= spiff.o output.o compare.o float.o
@@ -75,14 +75,15 @@ OBJ= spiff.o output.o compare.o float.o strings.o exac
CFILES= spiff.c output.c compare.c float.c strings.c exact.c miller.c parse.c command.c comment.c tol.c line.c floatrep.c token.c misc.c visual.c
HFILES=misc.h strings.h line.h float.h floatrep.h tol.h command.h comment.h token.h edit.h parse.h compare.h flagdefs.h exact.h miller.h visual.h output.h
OTHER=README Makefile Sample.1 Sample.2 Sample.3 Sample.4 paper.ms paper.out
@ -41,11 +41,11 @@ $OpenBSD: patch-Makefile,v 1.1 2005/09/05 13:25:04 espie Exp $
+CFLAGS+=$(OSFLAG) $(TFLAG) $(VISFLAG) $(DEFS)
-default: spiff
+all: spiff spiff.0
+all: spiff
spiff: $(OBJ)
$(CC) $(CFLAGS) -o spiff $(OBJ) $(VISLIB) -l$(TLIB)
@@ -95,7 +96,6 @@ visual.o: visual.c misc.h visual.h $(MGR
@@ -95,7 +96,6 @@ visual.o: visual.c misc.h visual.h $(MGRINCS)
misc.o: misc.c visual.h misc.h
parse.o: parse.c misc.h line.h command.h float.h tol.h comment.h parse.h token.h flagdefs.h
@ -61,13 +61,3 @@ $OpenBSD: patch-Makefile,v 1.1 2005/09/05 13:25:04 espie Exp $
$(CC) $(CFLAGS) -c compare.c
float.o: float.c misc.h strings.h float.h floatrep.h
@@ -145,5 +144,7 @@ cmd:
-$(CMD) $(CFILES) $(HFILES) $(OTHER) $(MANPAGE)
install:
mv spiff $(INSDIR)/bin
- cp $(MANPAGE) $(INSDIR)/man/man1
-
+ cp $(MANPAGE) $(INSDIR)/man/cat1
+
+spiff.0: spiff.1
+ nroff -man spiff.1 > spiff.0

14
textproc/spiff/patches/patch-command_c
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-command_c,v 1.1 2005/09/05 13:25:04 espie Exp $
$OpenBSD: patch-command_c,v 1.2 2011/07/03 22:55:26 naddy Exp $
--- command.c.orig Wed Sep 23 20:06:51 1998
+++ command.c Mon Sep 5 15:21:26 2005
@@ -172,17 +172,17 @@ C_clear_cmd()
+++ command.c Fri Jun 24 19:02:50 2011
@@ -12,6 +12,7 @@ static char rcsid[]= "$Header: /home/ian/ports/textpro
#endif
+#include <string.h>
#include "misc.h"
#include "tol.h"
#include "comment.h"
@@ -172,17 +173,17 @@ C_clear_cmd()
}
int

11
textproc/spiff/patches/patch-comment_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-comment_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- comment.c.orig Mon Feb 5 21:17:15 1990
+++ comment.c Fri Jun 24 19:11:49 2011
@@ -12,6 +12,7 @@ static char rcsid[]= "$Header: comment.c,v 1.1 88/09/1
#endif
+#include <string.h>
#include "misc.h"
#include "comment.h"
#include "strings.h"

6
textproc/spiff/patches/patch-compare_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-compare_c,v 1.1 2005/09/05 13:25:04 espie Exp $
$OpenBSD: patch-compare_c,v 1.2 2011/07/03 22:55:26 naddy Exp $
--- compare.c.orig Mon Feb 5 21:17:15 1990
+++ compare.c Mon Sep 5 15:21:26 2005
@@ -17,12 +17,15 @@ static char rcsid[]= "$Header: compare.c
+++ compare.c Fri Jun 24 18:05:34 2011
@@ -17,12 +17,15 @@ static char rcsid[]= "$Header: compare.c,v 1.1 88/09/1
#include "token.h"
#include "line.h"
#include "float.h"

11
textproc/spiff/patches/patch-exact_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-exact_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- exact.c.orig Fri Jun 24 19:01:09 2011
+++ exact.c Fri Jun 24 19:01:20 2011
@@ -11,6 +11,7 @@
static char rcsid[]= "$Header: /home/cvs/ports/textproc/spiff/patches/patch-exact_c,v 1.1 2011/07/03 22:55:26 naddy Exp $";
#endif
+#include <stdio.h>
#include "misc.h"
#include "edit.h"

12
textproc/spiff/patches/patch-float_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-float_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- float.c.orig Fri Jun 24 18:59:32 2011
+++ float.c Fri Jun 24 19:00:15 2011
@@ -12,6 +12,8 @@ static char rcsid[]= "$Header: float.c,v 1.1 88/09/15
#endif
#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
#include "misc.h"
#include "floatrep.h"
#include "float.h"

11
textproc/spiff/patches/patch-line_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-line_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- line.c.orig Fri Jun 24 19:03:33 2011
+++ line.c Fri Jun 24 19:03:44 2011
@@ -12,6 +12,7 @@ static char rcsid[]= "$Header: line.c,v 1.1 88/09/15 1
#endif
#include <stdio.h>
+#include <string.h>
#include "misc.h"
#include "token.h"
#include "line.h"

11
textproc/spiff/patches/patch-misc_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-misc_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- misc.c.orig Fri Jun 24 19:04:01 2011
+++ misc.c Fri Jun 24 19:04:18 2011
@@ -12,6 +12,7 @@ static char rcsid[]= "$Header: misc.c,v 1.1 88/09/15 1
#endif
#include <stdio.h>
+#include <stdlib.h>
#include "misc.h"
#include "visual.h"
#include "output.h"

12
textproc/spiff/patches/patch-output_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-output_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- output.c.orig Mon Feb 5 21:17:18 1990
+++ output.c Fri Jun 24 19:06:40 2011
@@ -12,6 +12,8 @@ static char rcsid[]= "$Header: output.c,v 1.1 88/09/15
#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#ifdef M_TERMINFO
#include <curses.h>

34
textproc/spiff/patches/patch-parse_c Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-parse_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- parse.c.orig Mon Feb 5 21:17:19 1990
+++ parse.c Fri Jun 24 19:09:49 2011
@@ -11,6 +11,7 @@
static char rcsid[]= "$Header: /home/cvs/ports/textproc/spiff/patches/patch-parse_c,v 1.1 2011/07/03 22:55:26 naddy Exp $";
#endif
+#include <string.h>
#include "misc.h"
#include "flagdefs.h"
#include "float.h"
@@ -68,9 +69,6 @@ static
_P_in_alpha(chr)
char chr;
{
-#ifndef ATT
- extern int index();
-#endif
/*
** special case when string terminator
** is handed to us
@@ -78,11 +76,7 @@ char chr;
if ('\0' == chr)
return(0);
-#ifdef ATT
- return((int) strchr(_P_alpha,chr));
-#else
- return((int) index(_P_alpha,chr));
-#endif
+ return(strchr(_P_alpha,chr) != NULL);
}
void

20
textproc/spiff/patches/patch-spiff_c
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-spiff_c,v 1.1 2005/09/05 13:25:04 espie Exp $
$OpenBSD: patch-spiff_c,v 1.2 2011/07/03 22:55:26 naddy Exp $
--- spiff.c.orig Mon Feb 5 21:17:20 1990
+++ spiff.c Mon Sep 5 15:21:26 2005
@@ -27,7 +27,8 @@ static char rcsid[]= "$Header: spiff.c,v
+++ spiff.c Fri Jun 24 18:58:34 2011
@@ -13,6 +13,7 @@ static char rcsid[]= "$Header: spiff.c,v 1.1 88/09/15
#include <stdio.h>
+#include <string.h>
#include "misc.h"
#include "flagdefs.h"
#include "parse.h"
@@ -27,7 +28,8 @@ static char rcsid[]= "$Header: spiff.c,v 1.1 88/09/15
#include "visual.h"
#include "output.h"
@ -11,7 +19,7 @@ $OpenBSD: patch-spiff_c,v 1.1 2005/09/05 13:25:04 espie Exp $
static int _Y_eflag = 0; /* use exact match algorithm */
static int _Y_vflag = 0; /* use visual mode */
@@ -38,9 +39,8 @@ static int _Y_vflag = 0; /* use visual m
@@ -38,9 +40,8 @@ static int _Y_vflag = 0; /* use visual mode */
*/
static int _Y_flags;
@ -23,7 +31,7 @@ $OpenBSD: patch-spiff_c,v 1.1 2005/09/05 13:25:04 espie Exp $
{
E_edit edit_end;
char *filename[2];
@@ -120,9 +120,9 @@ char *argv[];
@@ -120,9 +121,9 @@ char *argv[];
if (E_NULL != edit_end)
{
O_output(edit_end,_Y_flags);
@ -35,7 +43,7 @@ $OpenBSD: patch-spiff_c,v 1.1 2005/09/05 13:25:04 espie Exp $
}
/*
@@ -174,11 +174,7 @@ char *from;
@@ -174,11 +175,7 @@ char *from;
#define SETPTR {if(strlen(argv[1]) == 2) {argv++;argc--;ptr=argv[1];}else ptr=(&argv[1][2]);}
static void

11
textproc/spiff/patches/patch-strings_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-strings_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- strings.c.orig Fri Jun 24 19:00:26 2011
+++ strings.c Fri Jun 24 19:00:49 2011
@@ -12,6 +12,7 @@ static char rcsid[]= "$Header: strings.c,v 1.1 88/09/1
#endif
#include <ctype.h>
+#include <strings.h>
#include "misc.h"
#include "strings.h"

11
textproc/spiff/patches/patch-tol_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-tol_c,v 1.1 2011/07/03 22:55:26 naddy Exp $
--- tol.c.orig Fri Jun 24 19:03:05 2011
+++ tol.c Fri Jun 24 19:03:18 2011
@@ -11,6 +11,7 @@
static char rcsid[]= "$Header: /home/cvs/ports/textproc/spiff/patches/patch-tol_c,v 1.1 2011/07/03 22:55:26 naddy Exp $";
#endif
+#include <stdio.h>
#include "misc.h"
#include "float.h"
#include "tol.h"

6
textproc/spiff/pkg/PLIST
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2005/09/05 13:25:04 espie Exp $
bin/spiff
@man man/cat1/spiff.0
@comment $OpenBSD: PLIST,v 1.4 2011/07/03 22:55:26 naddy Exp $
@bin bin/spiff
@man man/man1/spiff.1