--- a/components/diffutils/diffutils.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/diffutils/diffutils.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -20,130 +20,125 @@
#
#
-# 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 uncommitted>
set name=pkg.fmri \
value=pkg:/text/gnu-diffutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU diffutils"
set name=pkg.description value="Finds differences between and among files"
-set name=pkg.summary value="GNU diffutils"
set name=com.oracle.info.description value="GNU diffutils"
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/2007/189
+set name=org.opensolaris.arc-caseid value=PSARC/2007/189
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/locale
-dir path=usr/share/locale/ca
-dir path=usr/share/locale/ca/LC_MESSAGES
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/el
-dir path=usr/share/locale/el/LC_MESSAGES
-dir path=usr/share/locale/eo
-dir path=usr/share/locale/eo/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/gl
-dir path=usr/share/locale/gl/LC_MESSAGES
-dir path=usr/share/locale/he
-dir path=usr/share/locale/he/LC_MESSAGES
-dir path=usr/share/locale/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
-dir path=usr/share/locale/id
-dir path=usr/share/locale/id/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/ms
-dir path=usr/share/locale/ms/LC_MESSAGES
-dir path=usr/share/locale/nl
-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/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/sr
-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/tr
-dir path=usr/share/locale/tr/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
+dir path=usr
+dir path=usr/bin
+link path=usr/bin/gcmp target=../gnu/bin/cmp facet.compat.gnulinks=true
+link path=usr/bin/gdiff target=../gnu/bin/diff facet.compat.gnulinks=true
+link path=usr/bin/gdiff3 target=../gnu/bin/diff3 facet.compat.gnulinks=true
+link path=usr/bin/gsdiff target=../gnu/bin/sdiff facet.compat.gnulinks=true
+dir path=usr/gnu
+dir path=usr/gnu/bin
file path=usr/gnu/bin/cmp
file path=usr/gnu/bin/diff
file path=usr/gnu/bin/diff3
file path=usr/gnu/bin/sdiff
-file path=usr/share/info/diff.info
-file path=usr/share/locale/ca/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/cs/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/da/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/de/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/el/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/eo/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/es/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/fi/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/fr/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/gl/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/he/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/hu/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/id/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/ja/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/ms/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/nl/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/pl/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/ro/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/ru/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/sr/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/sv/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/tr/LC_MESSAGES/diffutils.mo
-file path=usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
+dir path=usr/gnu/share
+dir path=usr/gnu/share/man
+dir path=usr/gnu/share/man/man1
file usr/share/man/man1/cmp.1 path=usr/gnu/share/man/man1/cmp.1
file usr/share/man/man1/diff.1 path=usr/gnu/share/man/man1/diff.1
file usr/share/man/man1/diff3.1 path=usr/gnu/share/man/man1/diff3.1
file usr/share/man/man1/sdiff.1 path=usr/gnu/share/man/man1/sdiff.1
-license diffutils.license license="GPLv2, FDLv1.2"
-link path=usr/bin/gcmp \
- target=../gnu/bin/cmp facet.compat.gnulinks=true
-link path=usr/bin/gdiff \
- target=../gnu/bin/diff facet.compat.gnulinks=true
-link path=usr/bin/gdiff3 \
- target=../gnu/bin/diff3 facet.compat.gnulinks=true
-link path=usr/bin/gsdiff \
- target=../gnu/bin/sdiff facet.compat.gnulinks=true
-link path=usr/share/man/man1/gcmp.1 \
- target=../../../gnu/share/man/man1/cmp.1 facet.compat.gnulinks=all
-link path=usr/share/man/man1/gdiff.1 \
- target=../../../gnu/share/man/man1/diff.1 facet.compat.gnulinks=all
+dir path=usr/share
+dir path=usr/share/info
+file path=usr/share/info/diff.info
+dir path=usr/share/locale
+dir path=usr/share/locale/ca
+dir path=usr/share/locale/ca/LC_MESSAGES
+file path=usr/share/locale/ca/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/cs
+dir path=usr/share/locale/cs/LC_MESSAGES
+file path=usr/share/locale/cs/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/da
+dir path=usr/share/locale/da/LC_MESSAGES
+file path=usr/share/locale/da/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/de
+dir path=usr/share/locale/de/LC_MESSAGES
+file path=usr/share/locale/de/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/el
+dir path=usr/share/locale/el/LC_MESSAGES
+file path=usr/share/locale/el/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/eo
+dir path=usr/share/locale/eo/LC_MESSAGES
+file path=usr/share/locale/eo/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/es
+dir path=usr/share/locale/es/LC_MESSAGES
+file path=usr/share/locale/es/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/fi
+dir path=usr/share/locale/fi/LC_MESSAGES
+file path=usr/share/locale/fi/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/fr
+dir path=usr/share/locale/fr/LC_MESSAGES
+file path=usr/share/locale/fr/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/gl
+dir path=usr/share/locale/gl/LC_MESSAGES
+file path=usr/share/locale/gl/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/he
+dir path=usr/share/locale/he/LC_MESSAGES
+file path=usr/share/locale/he/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/hu
+dir path=usr/share/locale/hu/LC_MESSAGES
+file path=usr/share/locale/hu/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/id
+dir path=usr/share/locale/id/LC_MESSAGES
+file path=usr/share/locale/id/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/ja
+dir path=usr/share/locale/ja/LC_MESSAGES
+file path=usr/share/locale/ja/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/ms
+dir path=usr/share/locale/ms/LC_MESSAGES
+file path=usr/share/locale/ms/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/nl
+dir path=usr/share/locale/nl/LC_MESSAGES
+file path=usr/share/locale/nl/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/pl
+dir path=usr/share/locale/pl/LC_MESSAGES
+file path=usr/share/locale/pl/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/pt_BR
+dir path=usr/share/locale/pt_BR/LC_MESSAGES
+file path=usr/share/locale/pt_BR/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/ro
+dir path=usr/share/locale/ro/LC_MESSAGES
+file path=usr/share/locale/ro/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/ru
+dir path=usr/share/locale/ru/LC_MESSAGES
+file path=usr/share/locale/ru/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/sr
+dir path=usr/share/locale/sr/LC_MESSAGES
+file path=usr/share/locale/sr/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/sv
+dir path=usr/share/locale/sv/LC_MESSAGES
+file path=usr/share/locale/sv/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/tr
+dir path=usr/share/locale/tr/LC_MESSAGES
+file path=usr/share/locale/tr/LC_MESSAGES/diffutils.mo
+dir path=usr/share/locale/zh_TW
+dir path=usr/share/locale/zh_TW/LC_MESSAGES
+file path=usr/share/locale/zh_TW/LC_MESSAGES/diffutils.mo
+dir path=usr/share/man
+dir path=usr/share/man/man1
+link path=usr/share/man/man1/gcmp.1 target=../../../gnu/share/man/man1/cmp.1 \
+ facet.compat.gnulinks=all
+link path=usr/share/man/man1/gdiff.1 target=../../../gnu/share/man/man1/diff.1 \
+ facet.compat.gnulinks=all
link path=usr/share/man/man1/gdiff3.1 \
target=../../../gnu/share/man/man1/diff3.1 facet.compat.gnulinks=all
link path=usr/share/man/man1/gsdiff.1 \
target=../../../gnu/share/man/man1/sdiff.1 facet.compat.gnulinks=all
+license diffutils.license license="GPLv2, FDLv1.2"