svn commit: r467795 - in head/textproc/bsdgrep: . files
Kyle Evans
kevans at FreeBSD.org
Thu Apr 19 18:22:48 UTC 2018
Author: kevans (src committer)
Date: Thu Apr 19 18:22:47 2018
New Revision: 467795
URL: https://svnweb.freebsd.org/changeset/ports/467795
Log:
[PATCH] textproc/bsdgrep: Update to 2.6.0 and set LICENSE
The following list of changes are roughly what has occurred since the last
update:
Features:
- With bsdgrep -r, the working directory is implied if no directory is
specified
- bsdgrep will now behave as bsdgrep -r does when it's named rgrep
- bsdgrep now understands -z/--null-data to use \0 as EOL
- GNU regex compatibility is now indicated with a "GNU compatible" in
the version string
Fixes:
- --mmap no longer hangs when coming across an EOF without an
accompanying EOL
- -o/--color matching generally improved, now produces earliest /
longest matches
- Context output now more closely aligns with GNU grep
- Zero-length matches no longer exhibit broken behavior
- Every output line now honors -b/-H/-n flags
Other fixes are also present.
While here, move to the version as reported by `grep -V` -- I intend to bump
the version in base sensible as bugfixes/features roll in.
Tested with: Poudriere (amd64, head)
Tested with: Poudriere (amd64, 11.1)
Tested with: Poudriere (amd64, 10.4)
Glanced at by: Portlint -AC
PR: 227639, 197531
Approved by: portmgr (feld)
Modified:
head/textproc/bsdgrep/Makefile
head/textproc/bsdgrep/distinfo
head/textproc/bsdgrep/files/patch-Makefile
head/textproc/bsdgrep/pkg-plist
Modified: head/textproc/bsdgrep/Makefile
==============================================================================
--- head/textproc/bsdgrep/Makefile Thu Apr 19 18:11:01 2018 (r467794)
+++ head/textproc/bsdgrep/Makefile Thu Apr 19 18:22:47 2018 (r467795)
@@ -2,21 +2,25 @@
# $FreeBSD$
PORTNAME= grep
-PORTVERSION= 20111002
-PORTREVISION= 2
+DISTVERSION= 2.6.0
+DISTVERSIONSUFFIX= -FreeBSD
+PORTEPOCH= 1
CATEGORIES= textproc
-MASTER_SITES= LOCAL/gabor
+MASTER_SITES= LOCAL/kevans
PKGNAMEPREFIX= bsd-
MAINTAINER= gabor at FreeBSD.org
COMMENT= BSD-licensed version of grep
+LICENSE= BSD2CLAUSE
+
USES= uidfix
MAKE_ENV+= BINDIR="${PREFIX}/bin" \
MANDIR="${MANPREFIX}/man/man" \
CATDIR="${MANPREFIX}/man/man" \
NLSDIR="${PREFIX}/share/nls"
+CFLAGS+= -std=gnu99
OPTIONS_DEFINE= GNU_COMPAT NLS
OPTIONS_DEFAULT= GNU_COMPAT
@@ -25,8 +29,10 @@ GNU_COMPAT_DESC= Use GNU regex library (recommended)
CONFLICTS= gnugrep-*
-NLS_MAKE_ENV_OFF= WITHOUT_NLS=yes
-GNU_COMPAT_MAKE_ENV_OFF= WITHOUT_GNU_COMPAT=yes
+NLS_MAKE_ENV= MK_NLS=yes
+NLS_MAKE_ENV_OFF= MK_NLS=no
+GNU_COMPAT_MAKE_ENV= MK_GNU_GREP_COMPAT=yes
+GNU_COMPAT_MAKE_ENV_OFF=MK_GNU_GREP_COMPAT=no
pre-install-NLS-on:
${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/gl_ES.ISO8859-1
Modified: head/textproc/bsdgrep/distinfo
==============================================================================
--- head/textproc/bsdgrep/distinfo Thu Apr 19 18:11:01 2018 (r467794)
+++ head/textproc/bsdgrep/distinfo Thu Apr 19 18:22:47 2018 (r467795)
@@ -1,2 +1,3 @@
-SHA256 (grep-20111002.tar.gz) = aea9d995e647f8fb8d3030b870111d2bb3babe013560b64fb8c3f4d84fcda89d
-SIZE (grep-20111002.tar.gz) = 32616
+TIMESTAMP = 1524157347
+SHA256 (grep-2.6.0-FreeBSD.tar.gz) = 228f246c1ed07a71525624b1eaf6243c2e28a99220d13683507eb1c722375ea1
+SIZE (grep-2.6.0-FreeBSD.tar.gz) = 36243
Modified: head/textproc/bsdgrep/files/patch-Makefile
==============================================================================
--- head/textproc/bsdgrep/files/patch-Makefile Thu Apr 19 18:11:01 2018 (r467794)
+++ head/textproc/bsdgrep/files/patch-Makefile Thu Apr 19 18:22:47 2018 (r467795)
@@ -1,35 +1,83 @@
---- Makefile.orig 2011-10-02 00:39:02.000000000 +0200
-+++ Makefile 2011-10-02 17:25:40.000000000 +0200
-@@ -4,23 +4,15 @@
+--- Makefile.orig 2017-10-19 20:07:52 UTC
++++ Makefile
+@@ -2,31 +2,13 @@
+ # $FreeBSD: head/usr.bin/grep/Makefile 322515 2017-08-14 19:21:37Z ngie $
+ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
- .include <bsd.own.mk>
-
+-.include <src.opts.mk>
+-
-.if ${MK_BSD_GREP} == "yes"
PROG= grep
-.else
-PROG= bsdgrep
-CLEANFILES+= bsdgrep.1
--
+
-bsdgrep.1: grep.1
-- cp ${.ALLSRC} ${.TARGET}
+- ${CP} ${.ALLSRC} ${.TARGET}
-.endif
SRCS= file.c grep.c queue.c util.c
-+CFLAGS+=-std=gnu99
+-
+-.if ${MK_BSD_GREP_FASTMATCH} == "yes"
+-# Extra files ported backported for some regex improvements
+-.PATH: ${.CURDIR}/regex
+-SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c
+-CFLAGS+=-I${.CURDIR}/regex
+-.else
+ CFLAGS+= -DWITHOUT_FASTMATCH
+-.endif
- # Extra files ported backported form some regex improvements
- .PATH: ${.CURDIR}/regex
- SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c xmalloc.c
- CFLAGS+=-I${.CURDIR}/regex
+ CFLAGS.gcc+= --param max-inline-insns-single=500
-.if ${MK_BSD_GREP} == "yes"
LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep \
- ${BINDIR}/grep ${BINDIR}/zgrep \
-@@ -50,7 +42,6 @@
- grep.1 lzgrep.1 \
- grep.1 lzegrep.1 \
- grep.1 lzfgrep.1
+ ${BINDIR}/grep ${BINDIR}/rgrep \
+@@ -40,14 +22,11 @@ MLINKS= grep.1 egrep.1 \
+ grep.1 zgrep.1 \
+ grep.1 zegrep.1 \
+ grep.1 zfgrep.1
-.endif
- LDADD= -lz -lbz2 -llzma
- DPADD= ${LIBZ} ${LIBBZ2} ${LIBLZMA}
+-LIBADD= z
++LDADD= -lz
+
+-.if ${MK_LZMA_SUPPORT} != "no"
+-LIBADD+= lzma
++LDADD+= -llzma
+
+-.if ${MK_BSD_GREP} == "yes"
+ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
+ ${BINDIR}/${PROG} ${BINDIR}/xzegrep \
+ ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
+@@ -61,29 +40,19 @@ MLINKS+= grep.1 xzgrep.1 \
+ grep.1 lzgrep.1 \
+ grep.1 lzegrep.1 \
+ grep.1 lzfgrep.1
+-.endif
+-.else
+-CFLAGS+= -DWITHOUT_LZMA
+-.endif
+
+-.if ${MK_BZIP2_SUPPORT} != "no"
+-LIBADD+= bz2
++LDADD+= -lbz2
+
+-.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
+
+ .if ${MK_GNU_GREP_COMPAT} != "no"
+ CFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DWITH_GNU
+-LIBADD+= gnuregex
++LDADD+= -lgnuregex
+ .endif
+
+ .if ${MK_NLS} != "no"
Modified: head/textproc/bsdgrep/pkg-plist
==============================================================================
--- head/textproc/bsdgrep/pkg-plist Thu Apr 19 18:11:01 2018 (r467794)
+++ head/textproc/bsdgrep/pkg-plist Thu Apr 19 18:22:47 2018 (r467795)
@@ -8,6 +8,7 @@ bin/grep
bin/lzegrep
bin/lzfgrep
bin/lzgrep
+bin/rgrep
bin/xzegrep
bin/xzfgrep
bin/xzgrep
@@ -23,6 +24,7 @@ man/man1/grep.1.gz
man/man1/lzegrep.1.gz
man/man1/lzfgrep.1.gz
man/man1/lzgrep.1.gz
+man/man1/rgrep.1.gz
man/man1/xzegrep.1.gz
man/man1/xzfgrep.1.gz
man/man1/xzgrep.1.gz
More information about the svn-ports-all
mailing list