--- a/components/mercurial/mercurial-PYVER.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/mercurial/mercurial-PYVER.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,74 +18,28 @@
#
# 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.
#
-set name=pkg.fmri value=pkg:/developer/versioning/mercurial-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/developer/versioning/mercurial-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Mercurial Source Control Management System"
-set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
-set name=com.oracle.info.description value="the Mercurial source control management system"
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=pkg.description \
+ value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description \
+ value="the Mercurial source control management system"
+set name=info.classification \
+ value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2006/417
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mercurial.copyright license='GPLv2+'
-license mercurial.copyright.google license='BSD 3-Clause'
-
-# force a dependency on the mercurial package
-depend fmri=developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=optional
-
-dir path=usr/lib/python$(PYVER)
-dir path=usr/lib/python$(PYVER)/vendor-packages
-dir path=usr/lib/python$(PYVER)/vendor-packages/hgext
-dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert
-dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight
-dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles
-dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan
-dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static
-
+link path=usr/bin/hg target=hg-$(PYVER) mediator=python \
+ mediator-version=$(PYVER)
file path=usr/bin/hg-$(PYVER)
+dir path=usr/lib/python$(PYVER)
+dir path=usr/lib/python$(PYVER)/vendor-packages
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/acl.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/blackbox.py
@@ -93,6 +47,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/children.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/churn.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/color.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/bzr.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/common.py
@@ -116,11 +71,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/graphlog.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgcia.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgk.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/highlight/highlight.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/histedit.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/interhg.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/keyword.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/basestore.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/lfcommands.py
@@ -148,8 +105,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/transplant.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/win32mbcs.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/win32text.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/Zeroconf.py
file path=usr/lib/python$(PYVER)/vendor-packages/hgext/zeroconf/__init__.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial-$(COMPONENT_VERSION)-py$(PYVER).egg-info
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/__version__.py
@@ -187,6 +146,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/formatter.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/graphmod.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hbisect.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/common.txt
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/config.txt
@@ -211,6 +171,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/templates.txt
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/urls.txt
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hg.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/common.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/hgweb_mod.py
@@ -222,6 +183,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/webutil.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hgweb/wsgicgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/hook.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/_readers.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpclient/socketutil.py
@@ -230,17 +192,42 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ignore.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/keepalive.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ro/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/ru/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/localrepo.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lock.py
@@ -274,7 +261,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmwindows.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/setdiscovery.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/similar.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/simplemerge.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshpeer.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sshserver.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sslutil.py
@@ -286,6 +274,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templatefilters.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templatekw.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templater.py
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/bookmarkentry.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/bookmarks.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/branchentry.tmpl
@@ -298,8 +288,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/map
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/tagentry.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/atom/tags.tmpl
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal/header.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/coal/map
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/bookmarks.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/branches.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/changelog.tmpl
@@ -330,6 +322,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.default
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.phases
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.xml
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/bookmarks.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/branches.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/changelog.tmpl
@@ -354,6 +347,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/shortlog.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/summary.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/tags.tmpl
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/bookmarks.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/branches.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/changeset.tmpl
@@ -378,6 +372,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/shortlog.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/shortlogentry.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/tags.tmpl
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/changelog.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/changeset.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/error.tmpl
@@ -392,6 +387,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/map
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/notfound.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/raw/search.tmpl
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/bookmarkentry.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/bookmarks.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/branchentry.tmpl
@@ -405,6 +401,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/map
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/tagentry.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/rss/tags.tmpl
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/branches.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/changelog.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/changelogentry.tmpl
@@ -426,6 +423,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/shortlog.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/shortlogentry.tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/tags.tmpl
+dir path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/background.png
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/coal-file.png
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/coal-folder.png
@@ -450,5 +448,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/windows.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireproto.py
file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/worker.py
+license mercurial.copyright.google license="BSD 3-Clause"
+license mercurial.copyright license=GPLv2+
-link path=usr/bin/hg target=hg-$(PYVER) mediator=python mediator-version=$(PYVER)
+# force a dependency on the mercurial package
+depend type=optional \
+ fmri=developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)