--- a/components/ggrep/Makefile	Wed Feb 27 12:01:23 2013 -0800
+++ b/components/ggrep/Makefile	Wed Feb 27 13:03:40 2013 -0800
@@ -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,12 +44,26 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--prefix=/usr
 
-# common targets
-build:		$(BUILD_32)
+# Enable aslr for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
-install:	$(INSTALL_32)
+# 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
 
-test:		$(TEST_32)
+# common targets
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+# 3 expected failures in gnulib-tests:
+# test-mbrtowc3.sh, test-mbrtowc4.sh, test-mbsrtowcs4.sh
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- a/components/ggrep/gnu-grep.license	Wed Feb 27 12:01:23 2013 -0800
+++ b/components/ggrep/gnu-grep.license	Wed Feb 27 13:03:40 2013 -0800
@@ -1,9 +1,8 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-===================================================================
+------------------
+- GNU grep v2.14 - 
+------------------
+
+Oracle Internal Tracking Number: 8710
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007

--- a/components/ggrep/gnu-grep.p5m	Wed Feb 27 12:01:23 2013 -0800
+++ b/components/ggrep/gnu-grep.p5m	Wed Feb 27 13:03:40 2013 -0800
@@ -18,7 +18,7 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -32,7 +32,7 @@
 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
@@ -101,6 +101,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
@@ -134,9 +136,9 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
-file usr/bin/egrep path=usr/gnu/bin/egrep
-file usr/bin/fgrep path=usr/gnu/bin/fgrep
-file usr/bin/grep path=usr/gnu/bin/grep
+file usr/bin/$(MACH64)/egrep path=usr/gnu/bin/egrep
+file usr/bin/$(MACH64)/fgrep path=usr/gnu/bin/fgrep
+file usr/bin/$(MACH64)/grep path=usr/gnu/bin/grep
 file path=usr/share/info/grep.info
 file path=usr/share/locale/af/LC_MESSAGES/grep.mo
 file path=usr/share/locale/be/LC_MESSAGES/grep.mo
@@ -165,6 +167,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