pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/bsdgrep-devel Update to 20071201.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e493a96c2c59
branches:  trunk
changeset: 536222:e493a96c2c59
user:      cjep <cjep%pkgsrc.org@localhost>
date:      Thu Dec 06 21:43:19 2007 +0000

description:
Update to 20071201.
* Sync with src/usr.bin/grep

diffstat:

 textproc/bsdgrep-devel/Makefile         |   7 +--
 textproc/bsdgrep-devel/distinfo         |  16 +++-------
 textproc/bsdgrep-devel/patches/patch-aa |  35 ++++++++++++----------
 textproc/bsdgrep-devel/patches/patch-ab |  34 ----------------------
 textproc/bsdgrep-devel/patches/patch-ac |  30 -------------------
 textproc/bsdgrep-devel/patches/patch-ad |  21 -------------
 textproc/bsdgrep-devel/patches/patch-ae |  40 -------------------------
 textproc/bsdgrep-devel/patches/patch-af |  31 --------------------
 textproc/bsdgrep-devel/patches/patch-ag |  51 ---------------------------------
 9 files changed, 27 insertions(+), 238 deletions(-)

diffs (truncated from 324 to 300 lines):

diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/Makefile
--- a/textproc/bsdgrep-devel/Makefile   Thu Dec 06 16:59:37 2007 +0000
+++ b/textproc/bsdgrep-devel/Makefile   Thu Dec 06 21:43:19 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/06/18 21:52:48 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/12/06 21:43:19 cjep Exp $
 #
 
-DISTNAME=      bsdgrep-200405051607
-PKGNAME=       bsdgrep-devel-20040505
-PKGREVISION=   3
+DISTNAME=      bsdgrep-20071201
+PKGNAME=       bsdgrep-devel-20071201
 CATEGORIES=    sysutils textproc
 MASTER_SITES=  http://www.fawlty.net/software/
 
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/distinfo
--- a/textproc/bsdgrep-devel/distinfo   Thu Dec 06 16:59:37 2007 +0000
+++ b/textproc/bsdgrep-devel/distinfo   Thu Dec 06 21:43:19 2007 +0000
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/12/18 14:27:01 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/12/06 21:43:20 cjep Exp $
 
-SHA1 (bsdgrep-200405051607.tar.gz) = 0a50caa04dab9ee576bb30f4abf62e03378d4f0e
-RMD160 (bsdgrep-200405051607.tar.gz) = 50b188e6f47d90491300a6310167dec17a5b927b
-Size (bsdgrep-200405051607.tar.gz) = 12972 bytes
-SHA1 (patch-aa) = c147bb05387e01b6f7e0ec8a918b09e77da2103c
-SHA1 (patch-ab) = 6d6967a3940a4e7c56a216cfccb4de70ac652c67
-SHA1 (patch-ac) = 71a95c262a008454a20159724414c3d3a8722c52
-SHA1 (patch-ad) = 094fa5ca4e46ef0d8d2352ba5e588f5846301508
-SHA1 (patch-ae) = e8151fbebbd10b069544ae5d2eb1ba003984f248
-SHA1 (patch-af) = 64e270f9c8d3df2994af83044de7ab3e47dc6415
-SHA1 (patch-ag) = e99328b3f66bc33f3c01c7a3d5e14434a4cd822e
+SHA1 (bsdgrep-20071201.tar.gz) = 119d1e7c8649ca43152e59b1836ac42601dfa3a9
+RMD160 (bsdgrep-20071201.tar.gz) = fa92b0f8d7a4a54d52427a7dc410b14eeffcaf07
+Size (bsdgrep-20071201.tar.gz) = 13029 bytes
+SHA1 (patch-aa) = 1fb0cd4d28d2ab9318aa1a18a70454ff4da0eab9
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-aa
--- a/textproc/bsdgrep-devel/patches/patch-aa   Thu Dec 06 16:59:37 2007 +0000
+++ b/textproc/bsdgrep-devel/patches/patch-aa   Thu Dec 06 21:43:19 2007 +0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/31 09:37:51 cjep Exp $
+$NetBSD
 
---- Makefile.orig      2003-07-20 14:45:41.000000000 +0100
-+++ Makefile
-@@ -2,16 +2,18 @@
+--- Makefile.orig      2006-05-15 21:12:21.000000000 +0000
++++ Makefile   2007-12-06 06:14:14.000000000 +0000
+@@ -1,22 +1,28 @@
+ # $NetBSD: patch-aa,v 1.2 2007/12/06 21:43:20 cjep Exp $
  
 -PROG= grep
 +PROG= bgrep
@@ -19,13 +20,11 @@
 -      grep.1 zgrep.1  \
 -      grep.1 zegrep.1 \
 -      grep.1 zfgrep.1
-+PREFIX?=      /usr/local
-+
-+LINKS=  ${BINDIR}/bgrep ${BINDIR}/ebgrep      \
-+      ${BINDIR}/bgrep ${BINDIR}/fbgrep        \
-+      ${BINDIR}/bgrep ${BINDIR}/zbgrep        \
-+      ${BINDIR}/bgrep ${BINDIR}/zebgrep       \
-+      ${BINDIR}/bgrep ${BINDIR}/zfbgrep
++LINKS=  ${BINDIR}/${PROG} ${BINDIR}/ebgrep    \
++      ${BINDIR}/${PROG} ${BINDIR}/fbgrep      \
++      ${BINDIR}/${PROG} ${BINDIR}/zbgrep      \
++      ${BINDIR}/${PROG} ${BINDIR}/zebgrep     \
++      ${BINDIR}/${PROG} ${BINDIR}/zfbgrep
 +
 +MLINKS= bgrep.1 ebgrep.1      \
 +      bgrep.1 fbgrep.1        \
@@ -33,10 +32,14 @@
 +      bgrep.1 zebgrep.1       \
 +      bgrep.1 zfbgrep.1
  
-@@ -19,2 +21,6 @@ LDADD=  -lz
+ LDADD=  -lz
+ 
+ WARNS=        4
  
-+MANDIR=${PREFIX}/man
-+BINDIR=${PREFIX}/bin
-+MKCATPAGES=no
 +
- WARNS=2
++PREFIX?=      /usr/local
++MANDIR=               ${PREFIX}/man
++BINDIR=               ${PREFIX}/bin
++MKCATPAGES=   no
++
+ .include <bsd.prog.mk>
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-ab
--- a/textproc/bsdgrep-devel/patches/patch-ab   Thu Dec 06 16:59:37 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/18 14:27:01 joerg Exp $
-
---- file.c.orig        2004-01-02 15:00:27.000000000 +0000
-+++ file.c
-@@ -34,10 +34,10 @@
- 
- #include <sys/param.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <zlib.h>
- 
- #include "grep.h"
- 
-@@ -122,7 +122,7 @@ gzfgetln(gzFile *f, size_t *len)
- }
- 
- file_t *
--grep_fdopen(int fd, char *mode)
-+grep_fdopen(int fd, const char *mode)
- {
-       file_t *f;
- 
-@@ -148,7 +148,7 @@ grep_fdopen(int fd, char *mode)
- }
- 
- file_t *
--grep_open(char *path, char *mode)
-+grep_open(const char *path, const char *mode)
- {
-       file_t *f;
- 
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-ac
--- a/textproc/bsdgrep-devel/patches/patch-ac   Thu Dec 06 16:59:37 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/12/18 14:27:01 joerg Exp $
-
---- grep.c.orig        2004-05-05 14:34:55.000000000 +0000
-+++ grep.c
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <errno.h>
- #include <getopt.h>
-@@ -111,7 +112,7 @@ int binbehave = BIN_FILE_BIN;
- int dirbehave = GREP_READ;
- int devbehave = GREP_READ;
- /*int linkbehave = LINK_FOLLOW;*/
--char *stdin_label;
-+const char *stdin_label;
- 
- enum {
-       BIN_OPT = CHAR_MAX + 1,
-@@ -137,7 +138,7 @@ usage(void)
-       exit(2);
- }
- 
--static char *optstr = "0123456789A:B:C:D:EFGHILUVZabcd:e:f:hilm:noqrsuvwxyz";
-+static const char optstr[] = "0123456789A:B:C:D:EFGHILUVZabcd:e:f:hilm:noqrsuvwxyz";
- 
- struct option long_options[] =
- {
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-ad
--- a/textproc/bsdgrep-devel/patches/patch-ad   Thu Dec 06 16:59:37 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/18 14:27:01 joerg Exp $
-
---- mmfile.c.orig      2004-01-02 15:00:34.000000000 +0000
-+++ mmfile.c
-@@ -36,6 +36,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <fcntl.h>
- #include <stdlib.h>
-@@ -46,7 +47,7 @@
- #define MAX_MAP_LEN 1048576
- 
- mmf_t *
--mmopen(char *fn, char *mode)
-+mmopen(const char *fn, const char *mode)
- {
-       mmf_t *mmf;
-       struct stat st;
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-ae
--- a/textproc/bsdgrep-devel/patches/patch-ae   Thu Dec 06 16:59:37 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/12/18 14:27:01 joerg Exp $
-
---- util.c.orig        2004-01-02 15:00:34.000000000 +0000
-+++ util.c
-@@ -36,6 +36,7 @@
- #include <sys/stat.h>
- 
- #include <ctype.h>
-+#include <zlib.h>
- #include <err.h>
- #include <errno.h>
- #include <fts.h>
-@@ -44,7 +45,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#include <zlib.h>
- 
- #include "grep.h"
- 
-@@ -99,7 +99,7 @@ grep_tree(char **argv)
- }
- 
- int
--procfile(char *fn)
-+procfile(const char *fn)
- {
-       str_t ln;
-       file_t *f;
-@@ -228,8 +228,8 @@ procline(str_t *l, int nottext)
-                               continue;
-                       if (r == 0) {
-                               if (wflag) {
--                                      if ((pmatch.rm_so != 0 && isword(l->dat[pmatch.rm_so - 1]))
--                                          || (pmatch.rm_eo != l->len && isword(l->dat[pmatch.rm_eo])))
-+                                      if ((pmatch.rm_so != 0 && isword((unsigned char)l->dat[pmatch.rm_so - 1]))
-+                                          || (pmatch.rm_eo != l->len && isword((unsigned char)l->dat[pmatch.rm_eo])))
-                                               r = REG_NOMATCH;
-                               }
-                               if (xflag) {
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-af
--- a/textproc/bsdgrep-devel/patches/patch-af   Thu Dec 06 16:59:37 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/12/21 16:09:44 agc Exp $
-
---- binary.c   2004/12/21 15:58:52     1.1
-+++ binary.c   2004/12/21 15:59:58
-@@ -53,7 +53,7 @@
-               return 0;
- 
-       for (i = 0; i < m; i++)
--              if (!isprint(buf[i]) && !isspace(buf[i]) && 
-+              if (!isprint((unsigned char)buf[i]) && !isspace((unsigned char)buf[i]) && 
-                   buf[i] != line_endchar)
-                       return 1; 
-       
-@@ -74,7 +74,7 @@
-               return 0;
- 
-       for (i = 0; i < m; i++)
--              if (!isprint(buf[i]) && !isspace(buf[i]) &&
-+              if (!isprint((unsigned char)buf[i]) && !isspace((unsigned char)buf[i]) &&
-                   buf[i] != line_endchar)
-                       return 1;
- 
-@@ -88,7 +88,7 @@
-       int i;
-       /* XXX knows too much about mmf internals */
-       for (i = 0; i < BUFFER_SIZE && i < f->len - 1; i++)
--              if (!isprint(f->base[i]) && !isspace(f->base[i]) &&
-+              if (!isprint((unsigned char)f->base[i]) && !isspace((unsigned char)f->base[i]) &&
-                   f->base[i] != line_endchar) 
-                       return 1;
-       mmrewind(f);
diff -r 74bd1229d27c -r e493a96c2c59 textproc/bsdgrep-devel/patches/patch-ag
--- a/textproc/bsdgrep-devel/patches/patch-ag   Thu Dec 06 16:59:37 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/08 17:24:32 joerg Exp $
-
---- grep.h.orig        2004-05-05 15:06:33.000000000 +0000
-+++ grep.h
-@@ -52,7 +52,7 @@ typedef struct {
-       size_t len;
-       int line_no;
-       int off;
--      char *file;
-+      const char *file;
-       char *dat;
- } str_t;
- 
-@@ -77,7 +77,7 @@ extern int zgrep;
- 
- extern int binbehave, dirbehave, devbehave; 
- /* extern int linkbehave; */
--extern char *stdin_label;
-+extern const char *stdin_label;
- 
- extern int first, matchall, patterns, tail;
- extern char **pattern;
-@@ -91,7 +91,7 @@ extern regex_t *r_pattern;
- extern char re_error[RE_ERROR_BUF + 1];
- 
- /* util.c */
--int procfile(char *fn);



Home | Main Index | Thread Index | Old Index