head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.82 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.80 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.78 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.76 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.74 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.72 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.70 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.68 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.66 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.64 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.62 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.60 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.58 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.56 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.54 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.52 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.50 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.48 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.46 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.44 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.42 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.40 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.38 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.34 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.14 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.36 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.32 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.30 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.28 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.26 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.24 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.22 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.20 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.18 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.16 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.12 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.10 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.8 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.6 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.4 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.2 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.6.0.4 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.2 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.5.0.32 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.30 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.28 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.26 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.24 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.22 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.20 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.18 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.16 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.14 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.12 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.10 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.8 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.6 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.2 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.4.0.30 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.28 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.26 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.24 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.22 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.20 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.18 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.16 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.14 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.12 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.10 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.8 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.6 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.4 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.2 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.1.1.1.0.32 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.30 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.28 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.26 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.24 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.22 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.20 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.18 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.16 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.14 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.12 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.10 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.8 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.6 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.4 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.2 pkgsrc-2003Q4-base:1.1.1.1 pkgsrc-devel:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2016.03.30.09.57.50; author jperkin; state Exp; branches; next 1.6; commitid XgLKYMZoDpJZoE0z; 1.6 date 2015.07.09.10.56.54; author jperkin; state Exp; branches; next 1.5; commitid bSXmDPBQWYqneBsy; 1.5 date 2011.09.29.20.46.59; author wiz; state Exp; branches; next 1.4; 1.4 date 2008.06.21.20.37.40; author joerg; state Exp; branches; next 1.3; 1.3 date 2007.12.13.21.48.39; author cjep; state Exp; branches; next 1.2; 1.2 date 2007.12.06.21.43.20; author cjep; state Exp; branches; next 1.1; 1.1 date 2003.08.31.09.37.51; author cjep; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.08.31.09.37.51; author cjep; state Exp; branches; next ; desc @@ 1.7 log @Use PKGMANDIR. @ text @$NetBSD: patch-aa,v 1.6 2015/07/09 10:56:54 jperkin Exp $ Call it bgrep. Pass pkgsrc variables. --- Makefile.orig 2006-05-15 21:12:21.000000000 +0000 +++ Makefile @@@@ -2,18 +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 +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 -LDADD= -lz +LDADD= -lz ${LIBS} @@@@ -21,2 +21,7 @@@@ WARNS= 4 +PREFIX?= /usr/local +MANDIR= ${PREFIX}/${PKGMANDIR} +BINDIR= ${PREFIX}/bin +MKCATPAGES?= no + .include @ 1.6 log @Various fixes: - Use nbcompat correctly. - Support newer zlib API. - Handle catpages correctly. Fixes build on SunOS at least. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2011/09/29 20:46:59 wiz Exp $ d42 1 a42 1 +MANDIR= ${PREFIX}/man @ 1.5 log @Remove -Werror so this builds on -current. While here, fix some pkglint warnings and set LICENSE. @ text @d1 3 a3 1 $NetBSD$ d6 2 a7 2 +++ Makefile 2007-12-08 23:52:46.000000000 +0000 @@@@ -2,21 +1,26 @@@@ d36 2 a37 1 LDADD= -lz d39 1 a39 1 WARNS= 4 d44 1 a44 1 +MKCATPAGES= no @ 1.4 log @Reduce context in diff to not cover RCS ID. Set USE_BSD_MAKEFILE. DESTDIR support. @ text @d1 2 @ 1.3 log @Load the correct tar at the download site, rebuild chksum and patch. From Yuji Yamano. @ text @d3 1 a3 2 @@@@ -1,22 +1,27 @@@@ # $NetBSD: Makefile,v 1.2 2006/05/15 21:12:21 rillig Exp $ @ 1.2 log @Update to 20071201. * Sync with src/usr.bin/grep @ text @a0 2 $NetBSD d2 2 a3 2 +++ Makefile 2007-12-06 06:14:14.000000000 +0000 @@@@ -1,22 +1,28 @@@@ d21 5 a25 5 +LINKS= ${BINDIR}/${PROG} ${BINDIR}/ebgrep \ + ${BINDIR}/${PROG} ${BINDIR}/fbgrep \ + ${BINDIR}/${PROG} ${BINDIR}/zbgrep \ + ${BINDIR}/${PROG} ${BINDIR}/zebgrep \ + ${BINDIR}/${PROG} ${BINDIR}/zfbgrep a36 1 + @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2003/08/25 11:13:00 cjep Exp $ d3 4 a6 3 --- Makefile.orig 2003-07-20 14:45:41.000000000 +0100 +++ Makefile @@@@ -2,16 +2,18 @@@@ d23 5 a27 7 +PREFIX?= /usr/local + +LINKS= ${BINDIR}/bgrep ${BINDIR}/ebgrep \ + ${BINDIR}/bgrep ${BINDIR}/fbgrep \ + ${BINDIR}/bgrep ${BINDIR}/zbgrep \ + ${BINDIR}/bgrep ${BINDIR}/zebgrep \ + ${BINDIR}/bgrep ${BINDIR}/zfbgrep d35 3 a37 1 @@@@ -19,2 +21,6 @@@@ LDADD= -lz a38 3 +MANDIR=${PREFIX}/man +BINDIR=${PREFIX}/bin +MKCATPAGES=no d40 6 a45 1 WARNS=2 @ 1.1.1.1 log @After discussion with grant, reimport bgrep as bsdgrep-devel. @ text @@