--- a/components/mc/mc.p5m	Mon Jun 17 23:00:40 2013 -0700
+++ b/components/mc/mc.p5m	Tue Jun 18 14:37:40 2013 +0200
@@ -26,7 +26,8 @@
 set name=pkg.description \
     value="GNU Midnight Commander is a full-screen text mode application that allows user to copy, move and delete files and whole directory trees, search for files and run commands in the subshell"
 set name=pkg.summary value="The GNU Midnight Commander file manager"
-set name=com.oracle.info.description value="GNU Midnight Commander file manager"
+set name=com.oracle.info.description value="The GNU Midnight Commander file manager"
+set name=com.oracle.info.tpno value=13150
 set name=info.classification \
     value="org.opensolaris.category.2008:Desktop (GNOME)/File Managers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -34,99 +35,7 @@
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/202
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/mc
-dir path=usr/share/locale
-dir path=usr/share/locale/az
-dir path=usr/share/locale/az/LC_MESSAGES
-dir path=usr/share/locale/be
-dir path=usr/share/locale/be/LC_MESSAGES
-dir path=usr/share/locale/bg
-dir path=usr/share/locale/bg/LC_MESSAGES
-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/eu
-dir path=usr/share/locale/eu/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/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/ko
-dir path=usr/share/locale/ko/LC_MESSAGES
-dir path=usr/share/locale/lt
-dir path=usr/share/locale/lt/LC_MESSAGES
-dir path=usr/share/locale/lv
-dir path=usr/share/locale/lv/LC_MESSAGES
-dir path=usr/share/locale/mn
-dir path=usr/share/locale/mn/LC_MESSAGES
-dir path=usr/share/locale/nb
-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/pl
-dir path=usr/share/locale/pl/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/sk
-dir path=usr/share/locale/sk/LC_MESSAGES
-dir path=usr/share/locale/sl
-dir path=usr/share/locale/sl/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/ta
-dir path=usr/share/locale/ta/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/wa
-dir path=usr/share/locale/wa/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
-dir path=usr/share/mc
-dir path=usr/share/mc/bin
-dir path=usr/share/mc/extfs.d
-dir path=usr/share/mc/fish
-dir path=usr/share/mc/skins
-dir path=usr/share/mc/syntax
-file path=usr/bin/mc
+file usr/bin/$(MACH64)/mc path=usr/bin/mc
 file ABOUT-NLS path=usr/share/doc/mc/ABOUT-NLS
 file AUTHORS path=usr/share/doc/mc/AUTHORS
 file COPYING path=usr/share/doc/mc/COPYING
@@ -184,9 +93,7 @@
 file path=usr/share/mc/bin/mc-wrapper.sh
 file path=usr/share/mc/bin/mc.csh
 file path=usr/share/mc/bin/mc.sh
-file path=usr/share/mc/cedit.menu
 file path=usr/share/mc/edit.indent.rc
-file path=usr/share/mc/edit.spell.rc
 file path=usr/share/mc/extfs.d/README
 file path=usr/share/mc/extfs.d/README.extfs
 file path=usr/share/mc/extfs.d/a+ mode=0555
@@ -212,7 +119,7 @@
 file path=usr/share/mc/extfs.d/uar mode=0555
 file path=usr/share/mc/extfs.d/uarc mode=0555
 file path=usr/share/mc/extfs.d/uarj mode=0555
-file path=usr/share/mc/extfs.d/uc1541 mode=0555
+file path=usr/share/mc/extfs.d/uc1541 mode=0555 pkg.depend.bypass-generate=.*
 file path=usr/share/mc/extfs.d/ucab mode=0555
 file path=usr/share/mc/extfs.d/uha mode=0555
 file path=usr/share/mc/extfs.d/ulha mode=0555
@@ -237,6 +144,7 @@
 file path=usr/share/mc/fish/unlink
 file path=usr/share/mc/mc.charsets
 file path=usr/share/mc/mc.ext
+file path=usr/share/mc/mcedit.menu
 file path=usr/share/mc/hints/mc.hint
 file path=usr/share/mc/hints/mc.hint.cs
 file path=usr/share/mc/hints/mc.hint.es
@@ -256,8 +164,8 @@
 file path=usr/share/mc/help/mc.hlp.ru
 file path=usr/share/mc/help/mc.hlp.sr
 file path=usr/share/mc/mc.keymap
-file path=usr/share/mc/mc.keymap.default
-file path=usr/share/mc/mc.keymap.emacs
+file path=usr/share/mc/mc.default.keymap
+file path=usr/share/mc/mc.emacs.keymap
 file path=usr/share/mc/mc.lib
 file path=usr/share/mc/mc.menu
 file path=usr/share/mc/mc.menu.sr
@@ -341,7 +249,7 @@
 file path=usr/share/mc/syntax/xml.syntax
 file path=usr/share/mc/syntax/yum-repo.syntax
 file path=usr/share/mc/syntax/yxx.syntax
-license mc.license license=GPLv2
+license mc.license license=GPLv3
 link path=usr/bin/mcdiff target=mc
 link path=usr/bin/mcedit target=mc
 link path=usr/bin/mcview target=mc