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

rename patches, fix manpage location.

Browse Source
This commit is contained in:
espie 2005-09-05 13:25:04 +00:00
parent 5f09738752
commit d814d7705f
8 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
textproc/spiff/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2004/12/07 00:23:23 alek Exp $
# $OpenBSD: Makefile,v 1.12 2005/09/05 13:25:04 espie Exp $
COMMENT= "very flexible diff-like program"
DISTNAME= spiff-1.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= textproc
MASTER_SITES= http://www.darwinsys.com/freeware/
@ -20,6 +21,6 @@ NO_REGRESS= Yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/spiff ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/spiff.0 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/spiff.0 ${PREFIX}/man/cat1
.include <bsd.port.mk>

17
textproc/spiff/patches/patch-11 → textproc/spiff/patches/patch-Makefile
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1 2005/09/05 13:25:04 espie Exp $
--- Makefile.orig Mon May 2 00:51:17 1994
+++ Makefile Mon Mar 26 11:11:32 2001
@@ -18,21 +18,21 @@
+++ Makefile Mon Sep 5 15:22:50 2005
@@ -18,21 +18,21 @@ INSDIR=/usr/local/bin
# choose a) b) or c)
#
# a) for BSD derivitives, enable the following line
@ -26,7 +27,7 @@
# b) if you are using terminfo on a XENIX machine, enable the following lines
#TFLAG=-DM_TERMINFO
@@ -75,14 +75,15 @@
@@ -75,14 +75,15 @@ OBJ= spiff.o output.o compare.o float.o
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
@ -44,7 +45,7 @@
spiff: $(OBJ)
$(CC) $(CFLAGS) -o spiff $(OBJ) $(VISLIB) -l$(TLIB)
@@ -95,7 +96,6 @@
@@ -95,7 +96,6 @@ visual.o: visual.c misc.h visual.h $(MGR
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
@ -52,7 +53,7 @@
$(CC) $(CFLAGS) -c parse.c
command.o: command.c float.h tol.h misc.h
@@ -107,7 +107,6 @@
@@ -107,7 +107,6 @@ tol.o: tol.c tol.h float.h
output.o: output.c output.h misc.h edit.h flagdefs.h
compare.o: compare.c misc.h strings.h float.h tol.h token.h line.h compare.h flagdefs.h
@ -60,11 +61,13 @@
$(CC) $(CFLAGS) -c compare.c
float.o: float.c misc.h strings.h float.h floatrep.h
@@ -146,4 +145,6 @@
@@ -145,5 +144,7 @@ cmd:
-$(CMD) $(CFILES) $(HFILES) $(OTHER) $(MANPAGE)
install:
mv spiff $(INSDIR)/bin
cp $(MANPAGE) $(INSDIR)/man/man1
- cp $(MANPAGE) $(INSDIR)/man/man1
-
+ cp $(MANPAGE) $(INSDIR)/man/cat1
+
+spiff.0: spiff.1
+ nroff -man spiff.1 > spiff.0

7
textproc/spiff/patches/patch-12 → textproc/spiff/patches/patch-command_c
View File

@ -1,6 +1,7 @@
--- command.c.orig Wed Sep 23 14:06:51 1998
+++ command.c Wed Sep 23 18:42:18 1998
@@ -172,17 +172,17 @@
$OpenBSD: patch-command_c,v 1.1 2005/09/05 13:25:04 espie 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()
}
int

13
textproc/spiff/patches/patch-13 → textproc/spiff/patches/patch-compare_c
View File

@ -1,6 +1,7 @@
--- compare.c.orig Mon Feb 5 15:17:15 1990
+++ compare.c Wed Sep 23 18:42:18 1998
@@ -17,12 +17,15 @@
$OpenBSD: patch-compare_c,v 1.1 2005/09/05 13:25:04 espie 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
#include "token.h"
#include "line.h"
#include "float.h"
@ -19,7 +20,7 @@
{
K_token atmp,btmp;
@@ -47,9 +50,7 @@
@@ -47,9 +50,7 @@ int a,b,flags;
** same as strcmp() except that case can be optionally ignored
*/
static int
@ -30,7 +31,7 @@
{
if (flags & U_NO_CASE)
{
@@ -84,9 +85,7 @@
@@ -84,9 +85,7 @@ int flags;
** routine to compare two tokens
*/
static int
@ -41,7 +42,7 @@
{
if (K_gettype(p1) != K_gettype(p2))
{
@@ -114,9 +113,7 @@
@@ -114,9 +113,7 @@ int flags;
** compare two F_floats using a tolerance
*/
static int

7
textproc/spiff/patches/patch-14 → textproc/spiff/patches/patch-misc_h
View File

@ -1,6 +1,7 @@
--- misc.h.orig Wed Sep 23 14:07:19 1998
+++ misc.h Wed Sep 23 18:42:18 1998
@@ -33,16 +33,6 @@
$OpenBSD: patch-misc_h,v 1.1 2005/09/05 13:25:04 espie Exp $
--- misc.h.orig Wed Sep 23 20:07:19 1998
+++ misc.h Mon Sep 5 15:21:26 2005
@@ -33,16 +33,6 @@ extern char Z_err_buf[];
#define Z_ALLOC(n,type) ((type*) _Z_myalloc((n) * sizeof (type)))
extern int *_Z_myalloc();

5
textproc/spiff/patches/patch-15 → textproc/spiff/patches/patch-spiff_1
View File

@ -1,5 +1,6 @@
--- spiff.1.orig Mon Feb 5 15:17:23 1990
+++ spiff.1 Wed Sep 23 18:42:19 1998
$OpenBSD: patch-spiff_1,v 1.1 2005/09/05 13:25:04 espie Exp $
--- spiff.1.orig Mon Feb 5 21:17:23 1990
+++ spiff.1 Mon Sep 5 15:21:26 2005
@@ -1,9 +1,5 @@
-.ll 6i
-.pl 10.5i

13
textproc/spiff/patches/patch-16 → textproc/spiff/patches/patch-spiff_c
View File

@ -1,6 +1,7 @@
--- spiff.c.orig Mon Feb 5 15:17:20 1990
+++ spiff.c Wed Sep 23 18:42:19 1998
@@ -27,7 +27,8 @@
$OpenBSD: patch-spiff_c,v 1.1 2005/09/05 13:25:04 espie 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
#include "visual.h"
#include "output.h"
@ -10,7 +11,7 @@
static int _Y_eflag = 0; /* use exact match algorithm */
static int _Y_vflag = 0; /* use visual mode */
@@ -38,9 +39,8 @@
@@ -38,9 +39,8 @@ static int _Y_vflag = 0; /* use visual m
*/
static int _Y_flags;
@ -22,7 +23,7 @@
{
E_edit edit_end;
char *filename[2];
@@ -120,9 +120,9 @@
@@ -120,9 +120,9 @@ char *argv[];
if (E_NULL != edit_end)
{
O_output(edit_end,_Y_flags);
@ -34,7 +35,7 @@
}
/*
@@ -174,11 +174,7 @@
@@ -174,11 +174,7 @@ char *from;
#define SETPTR {if(strlen(argv[1]) == 2) {argv++;argc--;ptr=argv[1];}else ptr=(&argv[1][2]);}
static void

4
textproc/spiff/pkg/PLIST
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2000/07/05 06:22:10 kevlo Exp $
@comment $OpenBSD: PLIST,v 1.3 2005/09/05 13:25:04 espie Exp $
bin/spiff
man/man1/spiff.0
@man man/cat1/spiff.0