From e67a30d69f582e66569b7b7c988df9de2c8de5dd Mon Sep 17 00:00:00 2001 From: Johan van Selst Date: Thu, 2 Jan 2014 17:33:44 +0000 Subject: - Update to GNU grep 2.16 (bugfix release) - Simplify options handling --- textproc/gnugrep/Makefile | 22 ++++++---------------- textproc/gnugrep/distinfo | 4 ++-- 2 files changed, 8 insertions(+), 18 deletions(-) (limited to 'textproc/gnugrep') diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile index 1e5a910a3aa6..6cf4e2cfce72 100644 --- a/textproc/gnugrep/Makefile +++ b/textproc/gnugrep/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grep -PORTVERSION= 2.15 +PORTVERSION= 2.16 CATEGORIES= textproc MASTER_SITES= GNU PKGNAMEPREFIX= gnu @@ -24,24 +24,14 @@ INFO= grep OPTIONS_DEFINE= PCRE NLS OPTIONS_DEFAULT=PCRE NLS +OPTIONS_SUB= yes +PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +PCRE_CONFIGURE_ENABLE= perl-regexp +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls .include -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -LDFLAGS+= -lintl -PLIST_SUB+= NLS= -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -.else -CONFIGURE_ARGS+= --disable-perl-regexp -.endif - post-patch: .if empty(PORT_OPTIONS:MNLS) @${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \ diff --git a/textproc/gnugrep/distinfo b/textproc/gnugrep/distinfo index 9dbd8c8e2a02..86a53ac99d36 100644 --- a/textproc/gnugrep/distinfo +++ b/textproc/gnugrep/distinfo @@ -1,2 +1,2 @@ -SHA256 (grep-2.15.tar.xz) = bf5a834e587974c8c64e71b35b9e75cd21c7ff253c0e7fbfb0a78be794965314 -SIZE (grep-2.15.tar.xz) = 1267312 +SHA256 (grep-2.16.tar.xz) = 16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 +SIZE (grep-2.16.tar.xz) = 1210192 -- cgit v1.2.3