From owner-svn-ports-all@FreeBSD.ORG  Thu Jan  2 17:33:45 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9677867D;
 Thu,  2 Jan 2014 17:33:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8228C1F1D;
 Thu,  2 Jan 2014 17:33:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02HXjsw003959;
 Thu, 2 Jan 2014 17:33:45 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02HXjTI003957;
 Thu, 2 Jan 2014 17:33:45 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201401021733.s02HXjTI003957@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Thu, 2 Jan 2014 17:33:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338463 - head/textproc/gnugrep
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jan 2014 17:33:45 -0000

Author: johans
Date: Thu Jan  2 17:33:44 2014
New Revision: 338463
URL: http://svnweb.freebsd.org/changeset/ports/338463

Log:
  - Update to GNU grep 2.16 (bugfix release)
  - Simplify options handling

Modified:
  head/textproc/gnugrep/Makefile
  head/textproc/gnugrep/distinfo

Modified: head/textproc/gnugrep/Makefile
==============================================================================
--- head/textproc/gnugrep/Makefile	Thu Jan  2 16:32:22 2014	(r338462)
+++ head/textproc/gnugrep/Makefile	Thu Jan  2 17:33:44 2014	(r338463)
@@ -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 <bsd.port.options.mk>
 
-.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//' \

Modified: head/textproc/gnugrep/distinfo
==============================================================================
--- head/textproc/gnugrep/distinfo	Thu Jan  2 16:32:22 2014	(r338462)
+++ head/textproc/gnugrep/distinfo	Thu Jan  2 17:33:44 2014	(r338463)
@@ -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