Sat Jun 21 20:37:40 2008 UTC ()
Reduce context in diff to not cover RCS ID. Set USE_BSD_MAKEFILE.
DESTDIR support.


(joerg)
diff -r1.13 -r1.14 pkgsrc/textproc/bsdgrep-devel/Makefile
diff -r1.11 -r1.12 pkgsrc/textproc/bsdgrep-devel/distinfo
diff -r1.3 -r1.4 pkgsrc/textproc/bsdgrep-devel/patches/patch-aa
cvs diff -r1.13 -r1.14 pkgsrc/textproc/bsdgrep-devel/Makefile (switch to unified diff)

--- pkgsrc/textproc/bsdgrep-devel/Makefile 2007/12/06 21:43:19 1.13
+++ pkgsrc/textproc/bsdgrep-devel/Makefile 2008/06/21 20:37:40 1.14
@@ -1,20 +1,23 @@ @@ -1,20 +1,23 @@
1# $NetBSD: Makefile,v 1.13 2007/12/06 21:43:19 cjep Exp $ 1# $NetBSD: Makefile,v 1.14 2008/06/21 20:37:40 joerg 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= cjep@NetBSD.org 9MAINTAINER= cjep@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
12 12
13MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} 13PKG_DESTDIR_SUPPORT= user-destdir
14MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} 14
 15USE_BSD_MAKEFILE= yes
 16
 17INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
15 18
16post-patch: 19post-patch:
17 @${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1 20 @${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1
18 21
19.include "../../devel/zlib/buildlink3.mk" 22.include "../../devel/zlib/buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/textproc/bsdgrep-devel/distinfo (switch to unified diff)

--- pkgsrc/textproc/bsdgrep-devel/distinfo 2007/12/13 21:48:39 1.11
+++ pkgsrc/textproc/bsdgrep-devel/distinfo 2008/06/21 20:37:40 1.12
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.11 2007/12/13 21:48:39 cjep Exp $ 1$NetBSD: distinfo,v 1.12 2008/06/21 20:37:40 joerg 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) = e8c11d96352d24e2880fe1f9bbeef6ded99b1569 6SHA1 (patch-aa) = bd3d73bbd72890173f63a63bf9f38725ad32c714
cvs diff -r1.3 -r1.4 pkgsrc/textproc/bsdgrep-devel/patches/patch-aa (switch to unified diff)

--- pkgsrc/textproc/bsdgrep-devel/patches/patch-aa 2007/12/13 21:48:39 1.3
+++ pkgsrc/textproc/bsdgrep-devel/patches/patch-aa 2008/06/21 20:37:40 1.4
@@ -1,42 +1,41 @@ @@ -1,42 +1,41 @@
1--- Makefile.orig 2006-05-15 21:12:21.000000000 +0000 1--- Makefile.orig 2006-05-15 21:12:21.000000000 +0000
2+++ Makefile 2007-12-08 23:52:46.000000000 +0000 2+++ Makefile 2007-12-08 23:52:46.000000000 +0000
3@@ -1,22 +1,27 @@ 3@@ -2,21 +1,26 @@
4 # $NetBSD: patch-aa,v 1.3 2007/12/13 21:48:39 cjep Exp $ 
5  4
6-PROG= grep 5-PROG= grep
7+PROG= bgrep 6+PROG= bgrep
8 SRCS= binary.c file.c grep.c mmfile.c queue.c util.c 7 SRCS= binary.c file.c grep.c mmfile.c queue.c util.c
9  8
10-LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ 9-LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
11- ${BINDIR}/grep ${BINDIR}/fgrep \ 10- ${BINDIR}/grep ${BINDIR}/fgrep \
12- ${BINDIR}/grep ${BINDIR}/zgrep \ 11- ${BINDIR}/grep ${BINDIR}/zgrep \
13- ${BINDIR}/grep ${BINDIR}/zegrep \ 12- ${BINDIR}/grep ${BINDIR}/zegrep \
14- ${BINDIR}/grep ${BINDIR}/zfgrep 13- ${BINDIR}/grep ${BINDIR}/zfgrep
15- 14-
16-MLINKS= grep.1 egrep.1 \ 15-MLINKS= grep.1 egrep.1 \
17- grep.1 fgrep.1 \ 16- grep.1 fgrep.1 \
18- grep.1 zgrep.1 \ 17- grep.1 zgrep.1 \
19- grep.1 zegrep.1 \ 18- grep.1 zegrep.1 \
20- grep.1 zfgrep.1 19- grep.1 zfgrep.1
21+LINKS= ${BINDIR}/bgrep ${BINDIR}/ebgrep \ 20+LINKS= ${BINDIR}/bgrep ${BINDIR}/ebgrep \
22+ ${BINDIR}/bgrep ${BINDIR}/fbgrep \ 21+ ${BINDIR}/bgrep ${BINDIR}/fbgrep \
23+ ${BINDIR}/bgrep ${BINDIR}/zbgrep \ 22+ ${BINDIR}/bgrep ${BINDIR}/zbgrep \
24+ ${BINDIR}/bgrep ${BINDIR}/zebgrep \ 23+ ${BINDIR}/bgrep ${BINDIR}/zebgrep \
25+ ${BINDIR}/bgrep ${BINDIR}/zfbgrep 24+ ${BINDIR}/bgrep ${BINDIR}/zfbgrep
26+ 25+
27+MLINKS= bgrep.1 ebgrep.1 \ 26+MLINKS= bgrep.1 ebgrep.1 \
28+ bgrep.1 fbgrep.1 \ 27+ bgrep.1 fbgrep.1 \
29+ bgrep.1 zbgrep.1 \ 28+ bgrep.1 zbgrep.1 \
30+ bgrep.1 zebgrep.1 \ 29+ bgrep.1 zebgrep.1 \
31+ bgrep.1 zfbgrep.1 30+ bgrep.1 zfbgrep.1
32  31
33 LDADD= -lz 32 LDADD= -lz
34  33
35 WARNS= 4 34 WARNS= 4
36  35
37+PREFIX?= /usr/local 36+PREFIX?= /usr/local
38+MANDIR= ${PREFIX}/man 37+MANDIR= ${PREFIX}/man
39+BINDIR= ${PREFIX}/bin 38+BINDIR= ${PREFIX}/bin
40+MKCATPAGES= no 39+MKCATPAGES= no
41+ 40+
42 .include <bsd.prog.mk> 41 .include <bsd.prog.mk>