--- a/components/ggrep/Makefile	Tue May 03 10:44:51 2016 -0700
+++ b/components/ggrep/Makefile	Tue May 03 12:46:52 2016 -0700
@@ -23,23 +23,21 @@
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64
+COMPILER= gcc
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		grep
-COMPONENT_VERSION=	2.22
+COMPONENT_VERSION=	2.25
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb
+    sha256:e21e83bac50450e0d0d61a42c154ee0dceaacdbf4f604ef6e79071cb8e596830
 COMPONENT_BUGDB=	utility/ggrep
 
-TPNO=			26437
+TPNO=			28105
 
 SYSTEM_TEST_TARGET= $(SOURCE_DIR)/.system-test-patched configure $(SYSTEM_TEST_64)
 include $(WS_MAKE_RULES)/gnu-component.mk
 
-# We need to be able to return from void functions
-CFLAGS += $(studio_FEATURES_EXTENSIONS)
-
 CONFIGURE_PREFIX   = $(USRGNUDIR)
 CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS += --localedir=$(USRSHARELOCALEDIR)
@@ -85,5 +83,6 @@
 	   $(GMAKE) clean build; \
 	fi
 
+REQUIRED_PACKAGES += developer/gcc
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += shell/bash

--- a/components/ggrep/test/results-64.master	Tue May 03 10:44:51 2016 -0700
+++ b/components/ggrep/test/results-64.master	Tue May 03 12:46:52 2016 -0700
@@ -8,6 +8,7 @@
 SKIP: big-match
 PASS: bogus-wctob
 PASS: bre
+PASS: c-locale
 PASS: case-fold-backref
 PASS: case-fold-backslash-w
 PASS: case-fold-char-class
@@ -25,6 +26,7 @@
 PASS: empty
 PASS: empty-line
 PASS: empty-line-mb
+PASS: encoding-error
 PASS: epipe
 XFAIL: equiv-classes
 PASS: ere
@@ -46,13 +48,13 @@
 PASS: khadafy
 PASS: kwset-abuse
 SKIP: long-line-vs-2GiB-read
-PASS: long-pattern-perf
+SKIP: long-pattern-perf
 PASS: match-lines
 PASS: max-count-overread
 PASS: max-count-vs-context
 PASS: mb-dot-newline
 PASS: mb-non-UTF8-overrun
-PASS: mb-non-UTF8-performance
+SKIP: mb-non-UTF8-performance
 PASS: multibyte-white-space
 PASS: multiple-begin-or-end-line
 PASS: null-byte
@@ -60,7 +62,9 @@
 PASS: pcre
 PASS: pcre-abort
 PASS: pcre-context
+PASS: pcre-count
 PASS: pcre-infloop
+PASS: pcre-invalid-utf8-infloop
 PASS: pcre-invalid-utf8-input
 PASS: pcre-jitstack
 PASS: pcre-o
@@ -85,6 +89,7 @@
 PASS: turkish-I-without-dot
 SKIP: turkish-eyes
 PASS: two-files
+PASS: unibyte-binary
 PASS: unibyte-bracket-expr
 PASS: unibyte-negated-circumflex
 PASS: utf8-bracket
@@ -92,10 +97,12 @@
 PASS: word-delim-multibyte
 PASS: word-multi-file
 PASS: word-multibyte
+SKIP: write-error-msg
 PASS: yesno
-# TOTAL: 95
-# PASS:  88
-# SKIP:  5
+PASS: z-anchor-newline
+# TOTAL: 102
+# PASS:  92
+# SKIP:  8
 # XFAIL: 2
 # FAIL:  0
 # XPASS: 0
@@ -192,7 +199,7 @@
 PASS: test-setlocale2.sh
 PASS: test-snprintf
 PASS: test-stat
-SKIP: test-stdalign
+PASS: test-stdalign
 PASS: test-stdbool
 PASS: test-stddef
 PASS: test-stdint
@@ -220,7 +227,6 @@
 PASS: test-uc_width
 PASS: uniwidth/test-uc_width2.sh
 PASS: test-unsetenv
-PASS: test-update-copyright.sh
 PASS: test-vasnprintf
 PASS: test-vc-list-files-git.sh
 PASS: test-vc-list-files-cvs.sh
@@ -239,9 +245,9 @@
 PASS: test-xalloc-die.sh
 PASS: test-xstrtoimax.sh
 PASS: test-xstrtol.sh
-# TOTAL: 139
+# TOTAL: 138
 # PASS:  132
-# SKIP:  7
+# SKIP:  6
 # XFAIL: 0
 # FAIL:  0
 # XPASS: 0