# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1327523965 28800
# Node ID 3e3828ae1878dd00adb03633faaa660bd689220f
# Parent  610373f31752984cce1b1b23f87a86f4ee366585
PSARC 2011/397 Update GNU grep to 2.10
7121690 Upgrade gnu grep to 2.10

diff -r 610373f31752 -r 3e3828ae1878 components/ggrep/Makefile
--- a/components/ggrep/Makefile	Tue Jan 24 10:40:48 2012 -0800
+++ b/components/ggrep/Makefile	Wed Jan 25 12:39:25 2012 -0800
@@ -18,16 +18,22 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		grep
-COMPONENT_VERSION=	2.5.4
+COMPONENT_VERSION=	2.10
 COMPONENT_PROJECT_URL=	http://gnu.org/software/grep/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
-COMPONENT_ARCHIVE_HASH=	sha1:9bbd4f02b18bb264e0fcb17293b6f0445c8694d2
+
+# 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 sha1 hash is for the payload .tar file.
+COMPONENT_ARCHIVE_HASH=	sha1:e8cab5e67ef06f74b460a8d8034f726c7a845f6d
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/grep/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
diff -r 610373f31752 -r 3e3828ae1878 components/ggrep/gnu-grep.p5m
--- a/components/ggrep/gnu-grep.p5m	Tue Jan 24 10:40:48 2012 -0800
+++ b/components/ggrep/gnu-grep.p5m	Wed Jan 25 12:39:25 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -32,8 +32,9 @@
 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/2000/488
+    value=PSARC/2011/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -102,16 +103,14 @@
 dir path=usr/share/locale/nl/LC_MESSAGES
 dir path=usr/share/locale/pl
 dir path=usr/share/locale/pl/LC_MESSAGES
+dir path=usr/share/locale/pt_BR
+dir path=usr/share/locale/pt_BR/LC_MESSAGES
 dir path=usr/share/locale/pt
 dir path=usr/share/locale/pt/LC_MESSAGES
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
 dir path=usr/share/locale/ro
 dir path=usr/share/locale/ro/LC_MESSAGES
 dir path=usr/share/locale/ru
 dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/rw
-dir path=usr/share/locale/rw/LC_MESSAGES
 dir path=usr/share/locale/sk
 dir path=usr/share/locale/sk/LC_MESSAGES
 dir path=usr/share/locale/sl
@@ -120,16 +119,21 @@
 dir path=usr/share/locale/sr/LC_MESSAGES
 dir path=usr/share/locale/sv
 dir path=usr/share/locale/sv/LC_MESSAGES
+dir path=usr/share/locale/th
+dir path=usr/share/locale/th/LC_MESSAGES
 dir path=usr/share/locale/tr
 dir path=usr/share/locale/tr/LC_MESSAGES
 dir path=usr/share/locale/uk
 dir path=usr/share/locale/uk/LC_MESSAGES
 dir path=usr/share/locale/vi
 dir path=usr/share/locale/vi/LC_MESSAGES
+dir path=usr/share/locale/zh_CN
+dir path=usr/share/locale/zh_CN/LC_MESSAGES
 dir path=usr/share/locale/zh_TW
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 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
@@ -162,26 +166,29 @@
 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/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
-file path=usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
 file path=usr/share/locale/ro/LC_MESSAGES/grep.mo
 file path=usr/share/locale/ru/LC_MESSAGES/grep.mo
-file path=usr/share/locale/rw/LC_MESSAGES/grep.mo
 file path=usr/share/locale/sk/LC_MESSAGES/grep.mo
 file path=usr/share/locale/sl/LC_MESSAGES/grep.mo
 file path=usr/share/locale/sr/LC_MESSAGES/grep.mo
 file path=usr/share/locale/sv/LC_MESSAGES/grep.mo
+file path=usr/share/locale/th/LC_MESSAGES/grep.mo
 file path=usr/share/locale/tr/LC_MESSAGES/grep.mo
 file path=usr/share/locale/uk/LC_MESSAGES/grep.mo
 file path=usr/share/locale/vi/LC_MESSAGES/grep.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/grep.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/grep.mo
 file usr/share/man/man1/egrep.1 path=usr/gnu/share/man/man1/egrep.1
 file usr/share/man/man1/fgrep.1 path=usr/gnu/share/man/man1/fgrep.1
 file usr/share/man/man1/grep.1 path=usr/gnu/share/man/man1/grep.1
+
 legacy pkg=SUNWggrp \
     desc="ggrep - GNU grep utilities" \
     name="ggrep - GNU grep utilities"
 license gnu-grep.license license="GPLv3, FDLv1.3"
+
 link path=usr/bin/gegrep \
     target=../gnu/bin/egrep facet.compat.gnulinks=true
 link path=usr/bin/gfgrep \
diff -r 610373f31752 -r 3e3828ae1878 components/ggrep/patches/ggrep.patch
--- a/components/ggrep/patches/ggrep.patch	Tue Jan 24 10:40:48 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- grep-2.5.4/tests/foad1.sh.orig	Fri Jan 28 16:47:12 2011
-+++ grep-2.5.4/tests/foad1.sh	Fri Jan 28 16:45:00 2011
-@@ -23,7 +23,7 @@
-   INPUT="$1"
-   EXPECT="$2"
-   shift 2
--  OUTPUT=`echo -n "$INPUT" | tr "/" "\n" | "$GREP" "$@" | tr "\n" "/"`
-+  OUTPUT=`printf "$INPUT" | tr "/" "\n" | "$GREP" "$@" | tr "\n" "/"`
-   if test "$OUTPUT" != "$EXPECT" || test "$VERBOSE" = "1"; then
-     echo "Testing:  $GREP $@"
-     test "$LC_ALL" != C && test "$LC_ALL" != "" && echo "  LC_ALL: \"$LC_ALL\""
diff -r 610373f31752 -r 3e3828ae1878 tools/userland-unpack
--- a/tools/userland-unpack	Tue Jan 24 10:40:48 2012 -0800
+++ b/tools/userland-unpack	Wed Jan 25 12:39:25 2012 -0800
@@ -44,6 +44,8 @@
 		uncompress = "/usr/bin/uncompress -c"
 	elif (re.search("(\.7z)$", filename) != None):
 		uncompress = "/usr/bin/7z --s"
+	elif (re.search("(\.xz)$", filename) != None):
+		uncompress = "/usr/bin/xz -dc"
 	elif (re.search("(\.zip)$", filename) != None):
 		uncompress = "/usr/bin/unzip -qo"