Thu Sep 29 20:46:59 2011 UTC ()
Remove -Werror so this builds on -current.
While here, fix some pkglint warnings and set LICENSE.


(wiz)
diff -r1.15 -r1.16 pkgsrc/textproc/bsdgrep-devel/Makefile
diff -r1.12 -r1.13 pkgsrc/textproc/bsdgrep-devel/distinfo
diff -r1.4 -r1.5 pkgsrc/textproc/bsdgrep-devel/patches/patch-aa
cvs diff -r1.15 -r1.16 pkgsrc/textproc/bsdgrep-devel/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/bsdgrep-devel/Makefile 2010/02/26 10:28:35 1.15
+++ pkgsrc/textproc/bsdgrep-devel/Makefile 2011/09/29 20:46:59 1.16
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile,v 1.15 2010/02/26 10:28:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2011/09/29 20:46:59 wiz Exp $
2# 2#
3 3
4DISTNAME= bsdgrep-20071201 4DISTNAME= bsdgrep-20071201
5PKGNAME= bsdgrep-devel-20071201 5PKGNAME= bsdgrep-devel-20071201
6CATEGORIES= sysutils textproc 6CATEGORIES= sysutils textproc
7MASTER_SITES= http://www.fawlty.net/software/ 7MASTER_SITES= http://www.fawlty.net/software/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= # none 10HOMEPAGE= # none
11COMMENT= BSD version of grep as in NetBSD src/usr.bin/grep 11COMMENT= BSD version of grep as in NetBSD src/usr.bin/grep
 12LICENSE= original-bsd
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15USE_BSD_MAKEFILE= yes 16USE_BSD_MAKEFILE= yes
 17BUILDLINK_TRANSFORM+= rm:-Werror
16 18
17INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 19INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
18 20
19post-patch: 21post-patch:
20 @${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1 22 ${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1
21 23
22.include "../../devel/zlib/buildlink3.mk" 24.include "../../devel/zlib/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/textproc/bsdgrep-devel/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/bsdgrep-devel/distinfo 2008/06/21 20:37:40 1.12
+++ pkgsrc/textproc/bsdgrep-devel/distinfo 2011/09/29 20:46:59 1.13
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.12 2008/06/21 20:37:40 joerg Exp $ 1$NetBSD: distinfo,v 1.13 2011/09/29 20:46:59 wiz Exp $
2 2
3SHA1 (bsdgrep-20071201.tar.gz) = ae5eabcaa6fbf1760023ee6f3d4a596fe1db9039 3SHA1 (bsdgrep-20071201.tar.gz) = ae5eabcaa6fbf1760023ee6f3d4a596fe1db9039
4RMD160 (bsdgrep-20071201.tar.gz) = 915ac4d8c6a44e56a6bf88454e7cc9ae5dc7f363 4RMD160 (bsdgrep-20071201.tar.gz) = 915ac4d8c6a44e56a6bf88454e7cc9ae5dc7f363
5Size (bsdgrep-20071201.tar.gz) = 13161 bytes 5Size (bsdgrep-20071201.tar.gz) = 13161 bytes
6SHA1 (patch-aa) = bd3d73bbd72890173f63a63bf9f38725ad32c714 6SHA1 (patch-aa) = cd477be4588aed5c09b4fdd920d84fdc27119185
cvs diff -r1.4 -r1.5 pkgsrc/textproc/bsdgrep-devel/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/bsdgrep-devel/patches/patch-aa 2008/06/21 20:37:40 1.4
+++ pkgsrc/textproc/bsdgrep-devel/patches/patch-aa 2011/09/29 20:46:59 1.5
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
 1$NetBSD: patch-aa,v 1.5 2011/09/29 20:46:59 wiz Exp $
 2
1--- Makefile.orig 2006-05-15 21:12:21.000000000 +0000 3--- Makefile.orig 2006-05-15 21:12:21.000000000 +0000
2+++ Makefile 2007-12-08 23:52:46.000000000 +0000 4+++ Makefile 2007-12-08 23:52:46.000000000 +0000
3@@ -2,21 +1,26 @@ 5@@ -2,21 +1,26 @@
4  6
5-PROG= grep 7-PROG= grep
6+PROG= bgrep 8+PROG= bgrep
7 SRCS= binary.c file.c grep.c mmfile.c queue.c util.c 9 SRCS= binary.c file.c grep.c mmfile.c queue.c util.c
8  10
9-LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ 11-LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
10- ${BINDIR}/grep ${BINDIR}/fgrep \ 12- ${BINDIR}/grep ${BINDIR}/fgrep \
11- ${BINDIR}/grep ${BINDIR}/zgrep \ 13- ${BINDIR}/grep ${BINDIR}/zgrep \
12- ${BINDIR}/grep ${BINDIR}/zegrep \ 14- ${BINDIR}/grep ${BINDIR}/zegrep \
13- ${BINDIR}/grep ${BINDIR}/zfgrep 15- ${BINDIR}/grep ${BINDIR}/zfgrep