diff options
| author | zuntum <zuntum@pkgsrc.org> | 2001-08-16 22:45:33 +0000 |
|---|---|---|
| committer | zuntum <zuntum@pkgsrc.org> | 2001-08-16 22:45:33 +0000 |
| commit | b6f1e02b652d5271de29c0803f70116094b268f1 (patch) | |
| tree | 55ec02f634ef52fa232e69191100e6471288b254 /devel/pardiff | |
| parent | a27a96bff4a45b8ad1a0fb1dfac77684185a209e (diff) | |
| download | pkgsrc-b6f1e02b652d5271de29c0803f70116094b268f1.tar.gz | |
Update pardiff to 0.9.4
Changelog:
* Version 0.9.4 (Aug 15, 2001)
* Handle context format diff (thanks Adam Bernstein)
* Portability fixes for {Net,Free,Open}Bsd (thanks Tomasz Luchowski)
* Fixed flawed #!/bin/sh line in diffp shell script (thanks Tomasz Luchowski)
Two patches are now in the distribution, so we can remove them.
Diffstat (limited to 'devel/pardiff')
| -rw-r--r-- | devel/pardiff/Makefile | 4 | ||||
| -rw-r--r-- | devel/pardiff/distinfo | 8 | ||||
| -rw-r--r-- | devel/pardiff/patches/patch-aa | 28 | ||||
| -rw-r--r-- | devel/pardiff/patches/patch-ab | 8 |
4 files changed, 5 insertions, 43 deletions
diff --git a/devel/pardiff/Makefile b/devel/pardiff/Makefile index d0bec0b97c5..22ea644d7aa 100644 --- a/devel/pardiff/Makefile +++ b/devel/pardiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/07/09 09:35:37 zuntum Exp $ +# $NetBSD: Makefile,v 1.2 2001/08/16 22:45:33 zuntum Exp $ # -DISTNAME= pardiff-0.9.3 +DISTNAME= pardiff-0.9.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pardiff/} diff --git a/devel/pardiff/distinfo b/devel/pardiff/distinfo index 03903037381..8fe53625508 100644 --- a/devel/pardiff/distinfo +++ b/devel/pardiff/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/07/09 17:17:03 zuntum Exp $ +$NetBSD: distinfo,v 1.3 2001/08/16 22:45:33 zuntum Exp $ -SHA1 (pardiff-0.9.3.tar.gz) = 263fdb4f3fb4f871ea50366e291141f354dd4535 -Size (pardiff-0.9.3.tar.gz) = 37383 bytes -SHA1 (patch-aa) = 2dd86e2e7303fd20797ad18dfbd43d4fa4597580 -SHA1 (patch-ab) = 3518faae523e57073d7265a96119b1e67563ae7b +SHA1 (pardiff-0.9.4.tar.gz) = 285248293feb87a03d410caa9193c4ac47f9942d +Size (pardiff-0.9.4.tar.gz) = 40325 bytes diff --git a/devel/pardiff/patches/patch-aa b/devel/pardiff/patches/patch-aa deleted file mode 100644 index 681025ca955..00000000000 --- a/devel/pardiff/patches/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2001/07/09 17:17:04 zuntum Exp $ - ---- pardiff/pardiff.c.orig Sat Jul 7 07:54:35 2001 -+++ pardiff/pardiff.c -@@ -23,7 +23,11 @@ - - /* include files to determine the width of the output terminal */ - #include <fcntl.h> -+#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ -+#include <sys/ttycom.h> -+#else - #include <termio.h> -+#endif - - - #else -@@ -314,7 +318,11 @@ - * Preprocess lines to get a consistent EOL - */ - if (convertCrlf) { -+#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ -+ line_len = strlen(nextline); -+#else - line_len = strnlen(nextline, PARDIFF_LINE_BUF_SIZE); -+#endif - if (line_len > 2 && nextline[line_len - 2] == 0xd) { - nextline[line_len - 2] = '\n'; - nextline[line_len - 1] = '\0'; diff --git a/devel/pardiff/patches/patch-ab b/devel/pardiff/patches/patch-ab deleted file mode 100644 index c124a641098..00000000000 --- a/devel/pardiff/patches/patch-ab +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2001/07/09 09:56:31 zuntum Exp $ - ---- pardiff/diffp.orig Sat Jan 8 05:34:47 2000 -+++ pardiff/diffp -@@ -1,2 +1,2 @@ --#/bin/sh -+#!/bin/sh - diff $1 $2 | pardiff | ${PAGER:=more} |