--- a/components/ggrep/gnu-grep.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/ggrep/gnu-grep.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,29 +18,37 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/text/gnu-grep@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU grep utilities"
set name=pkg.description \
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=$(TPNO)
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/2013/035
+set name=org.opensolaris.arc-caseid value=PSARC/2013/035
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/gegrep target=../gnu/bin/egrep facet.compat.gnulinks=true
+link path=usr/bin/gfgrep target=../gnu/bin/fgrep facet.compat.gnulinks=true
+link path=usr/bin/ggrep target=../gnu/bin/grep facet.compat.gnulinks=true
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 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
+link path=usr/sfw/bin/gegrep target=../../gnu/bin/egrep
+link path=usr/sfw/bin/gfgrep target=../../gnu/bin/fgrep
+link path=usr/sfw/bin/ggrep target=../../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
@@ -71,8 +79,8 @@
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/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/ro/LC_MESSAGES/grep.mo
file path=usr/share/locale/ru/LC_MESSAGES/grep.mo
file path=usr/share/locale/sk/LC_MESSAGES/grep.mo
@@ -85,27 +93,13 @@
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 \
- target=../gnu/bin/fgrep facet.compat.gnulinks=true
-link path=usr/bin/ggrep \
- target=../gnu/bin/grep facet.compat.gnulinks=true
link path=usr/share/man/man1/gegrep.1 \
target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=all
link path=usr/share/man/man1/gfgrep.1 \
target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=all
-link path=usr/share/man/man1/ggrep.1 \
- target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=all
-link path=usr/sfw/bin/gegrep target=../../gnu/bin/egrep
-link path=usr/sfw/bin/gfgrep target=../../gnu/bin/fgrep
-link path=usr/sfw/bin/ggrep target=../../gnu/bin/grep
+link path=usr/share/man/man1/ggrep.1 target=../../../gnu/share/man/man1/grep.1 \
+ facet.compat.gnulinks=all
+#
+legacy pkg=SUNWggrp desc="ggrep - GNU grep utilities" \
+ name="ggrep - GNU grep utilities"
+license gnu-grep.license license="GPLv3, FDLv1.3"