aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorjohans <johans@FreeBSD.org>2014-01-03 01:33:44 +0800
committerjohans <johans@FreeBSD.org>2014-01-03 01:33:44 +0800
commit6f0fbc42877d97dd4660b15bbd708b3914268321 (patch)
tree1570b1053767a6828a40b6dd95a4585a6ced7ade /textproc
parentf195245e5503ed89656eb684f359b99220362062 (diff)
downloadfreebsd-ports-gnome-6f0fbc42877d97dd4660b15bbd708b3914268321.tar.gz
freebsd-ports-gnome-6f0fbc42877d97dd4660b15bbd708b3914268321.tar.zst
freebsd-ports-gnome-6f0fbc42877d97dd4660b15bbd708b3914268321.zip
- Update to GNU grep 2.16 (bugfix release)
- Simplify options handling
Diffstat (limited to 'textproc')
-rw-r--r--textproc/gnugrep/Makefile22
-rw-r--r--textproc/gnugrep/distinfo4
2 files changed, 8 insertions, 18 deletions
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 <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//' \
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