svn commit: r226271 - in head/usr.bin/grep: . regex

[Aleksandr Rybalko]

On Tue, 11 Oct 2011 22:27:24 +0000 (UTC)
Gabor Kovesdan <gabor at FreeBSD.org> wrote:

> Author: gabor
> Date: Tue Oct 11 22:27:23 2011
> New Revision: 226271
> URL: http://svn.freebsd.org/changeset/base/226271
> 
> Log:
>   - Use getprogname() instead of __progname
>   - Allow disabling bzip2 support with WITHOUT_BZIP2
>   - Fix handling patterns that start with a dot
>   - Remove superfluous semicolon
>   
>   Approved by:	delphij (mentor)
> 
> Modified:
>   head/usr.bin/grep/Makefile
>   head/usr.bin/grep/file.c
>   head/usr.bin/grep/grep.c
>   head/usr.bin/grep/regex/tre-fastmatch.c
> 

Hi Gabor,

attached path fix install with WITH_BSD_GREP=yes

Index: Makefile
===================================================================
--- Makefile	(revision 226462)
+++ Makefile	(working copy)
@@ -53,12 +53,14 @@
 LDADD+=	-lbz2
 DPADD+=	${LIBBZ2}
 
+.if ${MK_BSD_GREP} == "yes"
 LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
 	${BINDIR}/grep ${BINDIR}/bzegrep \
 	${BINDIR}/grep ${BINDIR}/bzfgrep
 MLINKS+= grep.1 bzgrep.1 \
 	 grep.1 bzegrep.1 \
 	 grep.1 bzfgrep.1
+.endif
 .else
 CFLAGS+= -DWITHOUT_BZIP2
 .endif

=8<================================8<===========================8<=

Thank you for your big work!

WBW
-- 
Aleksandr Rybalko <ray at ddteam.net>