--- a/components/ggrep/Makefile	Sat Apr 06 08:18:24 2013 -0700
+++ b/components/ggrep/Makefile	Mon Apr 08 08:53:46 2013 -0700
@@ -18,23 +18,18 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		grep
-COMPONENT_VERSION=	2.10
+COMPONENT_VERSION=	2.14
 COMPONENT_PROJECT_URL=	http://gnu.org/software/grep/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 
-# Note that the 2.10 version of the compressed GNU grep tarball on
-# ftp.gnu.org is only available in .xz format. We cannot use this
-# as xz is not currently part of the Solaris 11 Update CBE. We 
-# have recompressed that tarball as a .bz2 file and placed it in the
-# special Userland cache. The sha256 hash is for the payload .tar file.
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:299d0ccb0238894cc674da3c5a6a6fb82c3d63286f7f127e448e2ff97d21e2fb
+    sha256:e70e801d4fbb16e761654a58ae48bf5020621c95c8e35bd864742577685872e1
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/grep/$(COMPONENT_ARCHIVE)
 
 COMPONENT_BUGDB=	utility/ggrep
@@ -49,11 +44,22 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--prefix=/usr
 
+# Needed for "gmake test" to work.
+# SHELLOPTS is exported via make-rules/shared-macros.mk,
+# causing the braceexpand option to be set.
+# This option causes "$1: unbound variable" errors during the check-TESTS,
+# and the gnulib-tests don't even run at all.
+# Note that the below unexports SHELLOPTS, even for targets
+# other than "test."
+unexport SHELLOPTS
+
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+# 3 expected failures in gnulib-tests:
+# test-mbrtowc3.sh, test-mbrtowc4.sh, test-mbsrtowcs4.sh
 test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)

--- a/components/ggrep/gnu-grep.license	Sat Apr 06 08:18:24 2013 -0700
+++ b/components/ggrep/gnu-grep.license	Mon Apr 08 08:53:46 2013 -0700
@@ -679,7 +679,7 @@
                  Version 1.3, 3 November 2008
 
 
- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002, 2007, 2008, 2010-2012 Free Software Foundation, Inc.
      <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.

--- a/components/ggrep/gnu-grep.p5m	Sat Apr 06 08:18:24 2013 -0700
+++ b/components/ggrep/gnu-grep.p5m	Mon Apr 08 08:53:46 2013 -0700
@@ -28,12 +28,13 @@
     value="The grep command searches one or more input files for lines containing a match to a specified pattern."
 set name=pkg.summary value="GNU grep utilities"
 set name=com.oracle.info.description value="GNU grep"
+set name=com.oracle.info.tpno value=8710
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/2011/397
+    value=PSARC/2013/035
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
@@ -102,6 +103,8 @@
 dir path=usr/share/locale/nb/LC_MESSAGES
 dir path=usr/share/locale/nl
 dir path=usr/share/locale/nl/LC_MESSAGES
+dir path=usr/share/locale/pa
+dir path=usr/share/locale/pa/LC_MESSAGES
 dir path=usr/share/locale/pl
 dir path=usr/share/locale/pl/LC_MESSAGES
 dir path=usr/share/locale/pt_BR
@@ -166,6 +169,7 @@
 file path=usr/share/locale/lt/LC_MESSAGES/grep.mo
 file path=usr/share/locale/nb/LC_MESSAGES/grep.mo
 file path=usr/share/locale/nl/LC_MESSAGES/grep.mo
+file path=usr/share/locale/pa/LC_MESSAGES/grep.mo
 file path=usr/share/locale/pl/LC_MESSAGES/grep.mo
 file path=usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
 file path=usr/share/locale/pt/LC_MESSAGES/grep.mo