diff --git a/[refs] b/[refs] index 31b36444d396f..6a4effbf6b42a 100644 --- a/[refs] +++ b/[refs] @@ -16,7 +16,7 @@ refs/heads/cwrapper: 446ab81a1bf9d3fc8b161bb577942377f0fa003d "refs/heads/netbsd_1_6": 8746acfe58a8e19273d335f8c5aaf6774cacde82 "refs/heads/netbsd_1_6_1": 483aa682392b7429f88b5e2493be8d77f6c41fae "refs/heads/pkg_install_renovation": 1d447114d1bd26416e869ba2ca7332baf545d016 -"refs/heads/pkgsrc_2003Q4": da51a360fc28d0f4df506525b5611e0b9def2ded +"refs/heads/pkgsrc_2003Q4": ed670285eb70dc3d4ebd936dba05b76afb19ddc5 "refs/heads/pkgsrc_2004Q1": e6de4c95a7f6621c27f0ac0e42322ba492356ed7 "refs/heads/pkgsrc_2004Q2": a2c62dbf727579075c0fa010bb4d16863648175a "refs/heads/pkgsrc_2004Q3": 0e184faefc6d1665fc5b7e55232a3f5941aaefcb diff --git a/branches/pkgsrc_2003Q4/devel/pardiff/Makefile b/branches/pkgsrc_2003Q4/devel/pardiff/Makefile index d0bec0b97c5c4..22ea644d7aae9 100644 --- a/branches/pkgsrc_2003Q4/devel/pardiff/Makefile +++ b/branches/pkgsrc_2003Q4/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/branches/pkgsrc_2003Q4/devel/pardiff/distinfo b/branches/pkgsrc_2003Q4/devel/pardiff/distinfo index 039030373817d..8fe536255086d 100644 --- a/branches/pkgsrc_2003Q4/devel/pardiff/distinfo +++ b/branches/pkgsrc_2003Q4/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/branches/pkgsrc_2003Q4/devel/pardiff/patches/patch-aa b/branches/pkgsrc_2003Q4/devel/pardiff/patches/patch-aa deleted file mode 100644 index 681025ca95507..0000000000000 --- a/branches/pkgsrc_2003Q4/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 -+#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ -+#include -+#else - #include -+#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/branches/pkgsrc_2003Q4/devel/pardiff/patches/patch-ab b/branches/pkgsrc_2003Q4/devel/pardiff/patches/patch-ab deleted file mode 100644 index c124a641098d9..0000000000000 --- a/branches/pkgsrc_2003Q4/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}