pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc After discussion with grant, reimport bgrep as bsdgrep...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/95ca8ed3645b
branches:  trunk
changeset: 460516:95ca8ed3645b
user:      cjep <cjep%pkgsrc.org@localhost>
date:      Sun Aug 31 09:43:47 2003 +0000

description:
After discussion with grant, reimport bgrep as bsdgrep-devel.

diffstat:

 doc/CHANGES                     |   3 +-
 textproc/Makefile               |   4 +-
 textproc/bgrep/DESCR            |   2 -
 textproc/bgrep/Makefile         |  19 ------------------
 textproc/bgrep/PLIST            |   9 --------
 textproc/bgrep/distinfo         |   9 --------
 textproc/bgrep/patches/patch-aa |  42 -----------------------------------------
 textproc/bgrep/patches/patch-ab |  16 ---------------
 textproc/bgrep/patches/patch-ac |  12 -----------
 textproc/bgrep/patches/patch-ad |  12 -----------
 textproc/bgrep/patches/patch-ae |  20 -------------------
 11 files changed, 4 insertions(+), 144 deletions(-)

diffs (212 lines):

diff -r 93d2587461eb -r 95ca8ed3645b doc/CHANGES
--- a/doc/CHANGES       Sun Aug 31 09:41:06 2003 +0000
+++ b/doc/CHANGES       Sun Aug 31 09:43:47 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3168 2003/08/31 02:04:57 jtb Exp $
+$NetBSD: CHANGES,v 1.3169 2003/08/31 09:43:47 cjep Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3421,3 +3421,4 @@
        Added camlimages-2.11 [jtb 2003-08-31]
        Added advi-1.4.0 [jtb 2003-08-31]
        Updated xcircuit to 3.1.19 [jtb 2003-08-31]
+       Deleted bgrep, renamed to bsdgrep-devel [cjep 2003-08-31]
diff -r 93d2587461eb -r 95ca8ed3645b textproc/Makefile
--- a/textproc/Makefile Sun Aug 31 09:41:06 2003 +0000
+++ b/textproc/Makefile Sun Aug 31 09:43:47 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2003/08/30 16:19:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.207 2003/08/31 09:43:49 cjep Exp $
 #
 
 COMMENT=       Text processing utilities (does not include desktop publishing)
@@ -31,10 +31,10 @@
 SUBDIR+=       aspell-svenska
 SUBDIR+=       aspell-ukrainian
 SUBDIR+=       aspell-welsh
-SUBDIR+=       bgrep
 SUBDIR+=       bibclean
 SUBDIR+=       biblook
 SUBDIR+=       bibparse
+SUBDIR+=       bsdgrep-devel
 SUBDIR+=       btparse
 SUBDIR+=       catdoc
 SUBDIR+=       cdif
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/DESCR
--- a/textproc/bgrep/DESCR      Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This is a BSD-licensed grep(1) replacement. It is currently being
-developed in NetBSD's othersrc module.
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/Makefile
--- a/textproc/bgrep/Makefile   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/08/30 11:33:42 cjep Exp $
-#
-
-DISTNAME=      bgrep-20030825
-WRKSRC=                ${WRKDIR}/nbgrep-20030825
-CATEGORIES=    sysutils textproc
-MASTER_SITES=  http://www.fawlty.net/software/
-
-MAINTAINER=    cjep%netbsd.org@localhost
-HOMEPAGE=      # none
-COMMENT=       BSD version of grep as in NetBSD othersrc
-
-CONFLICTS+=            bsdgrep-*
-#ONLY_FOR_PLATFORM=    NetBSD-1.6*-*
-
-post-patch:
-       @${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1
-
-.include "../../mk/bsd.pkg.mk"
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/PLIST
--- a/textproc/bgrep/PLIST      Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/25 11:13:00 cjep Exp $
-bin/bgrep
-bin/ebgrep
-bin/fbgrep
-bin/zbgrep
-man/man1/bgrep.1
-man/man1/ebgrep.1
-man/man1/fbgrep.1
-man/man1/zbgrep.1
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/distinfo
--- a/textproc/bgrep/distinfo   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/08/27 18:32:47 jmc Exp $
-
-SHA1 (bgrep-20030825.tar.gz) = 847f81eb1530fb7372c91607270f5b77de661518
-Size (bgrep-20030825.tar.gz) = 12921 bytes
-SHA1 (patch-aa) = c147bb05387e01b6f7e0ec8a918b09e77da2103c
-SHA1 (patch-ab) = c7fa54dedb0925d342549cbc56197bf2d8e4e47b
-SHA1 (patch-ac) = e5b3d3a2bc069f123a7f568f72ded291f3ac49ea
-SHA1 (patch-ad) = 8080d6fa8f5faa40055ad1f067c1669d682956d2
-SHA1 (patch-ae) = 360972fb9c9a759cce1ad726ad14647b8b140a4e
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/patches/patch-aa
--- a/textproc/bgrep/patches/patch-aa   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/25 11:13:00 cjep Exp $
-
---- Makefile.orig      2003-07-20 14:45:41.000000000 +0100
-+++ Makefile
-@@ -2,16 +2,18 @@
- 
--PROG= grep
-+PROG= bgrep
- SRCS= binary.c file.c grep.c mmfile.c queue.c util.c
- 
--LINKS=  ${BINDIR}/grep ${BINDIR}/egrep        \
--      ${BINDIR}/grep ${BINDIR}/fgrep  \
--      ${BINDIR}/grep ${BINDIR}/zgrep  \
--      ${BINDIR}/grep ${BINDIR}/zegrep \
--      ${BINDIR}/grep ${BINDIR}/zfgrep
--
--MLINKS= grep.1 egrep.1        \
--      grep.1 fgrep.1  \
--      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
-+
-+MLINKS= bgrep.1 ebgrep.1      \
-+      bgrep.1 fbgrep.1        \
-+      bgrep.1 zbgrep.1        \
-+      bgrep.1 zebgrep.1       \
-+      bgrep.1 zfbgrep.1
- 
-@@ -19,2 +21,6 @@ LDADD=  -lz
- 
-+MANDIR=${PREFIX}/man
-+BINDIR=${PREFIX}/bin
-+MKCATPAGES=no
-+
- WARNS=2
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/patches/patch-ab
--- a/textproc/bgrep/patches/patch-ab   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/08/27 18:32:48 jmc Exp $
-
---- file.c.orig        Wed Aug 27 12:59:52 2003
-+++ file.c     Wed Aug 27 13:00:09 2003
-@@ -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"
- 
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/patches/patch-ac
--- a/textproc/bgrep/patches/patch-ac   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/08/27 18:32:48 jmc Exp $
-
---- grep.c.orig        Wed Aug 27 13:00:48 2003
-+++ grep.c     Wed Aug 27 13:01:03 2003
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <errno.h>
- #include <getopt.h>
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/patches/patch-ad
--- a/textproc/bgrep/patches/patch-ad   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/08/27 18:32:48 jmc Exp $
-
---- mmfile.c.orig      Wed Aug 27 13:01:21 2003
-+++ mmfile.c   Wed Aug 27 13:01:42 2003
-@@ -36,6 +36,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <fcntl.h>
- #include <stdlib.h>
diff -r 93d2587461eb -r 95ca8ed3645b textproc/bgrep/patches/patch-ae
--- a/textproc/bgrep/patches/patch-ae   Sun Aug 31 09:41:06 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/08/27 18:32:49 jmc Exp $
-
---- util.c.orig        Wed Aug 27 13:01:54 2003
-+++ util.c     Wed Aug 27 13:02:02 2003
-@@ -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"
- 



Home | Main Index | Thread Index | Old Index