svn commit: r338463 - head/textproc/gnugrep

[Johan van Selst]

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