diff -r ed80ca124641 -r cb999e84659c components/texinfo/texinfo.p5m
--- a/components/texinfo/texinfo.p5m	Tue Nov 19 07:55:28 2013 -0800
+++ b/components/texinfo/texinfo.p5m	Wed Nov 20 13:33:31 2013 -0800
@@ -20,6 +20,10 @@
 #
 # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
+# Note for the next texinfo maintainer:
+# if "file path=usr/lib/$(MACH64)/charset.alias" is in your texinfo.p5m file,
+# you may want to remove it, since charset.alias is coming from pkg: library/glib2
+#
 
 <transform file path=usr.*/man/.+$ -> default mangler.man.stability volatile>
 
@@ -27,7 +31,7 @@
 set name=pkg.summary value="Documentation system for on-line information and printed output"
 set name=pkg.description value="Texinfo is a documentation system that uses a single source file to produce both on-line information and printed output."
 set name=com.oracle.info.description value="Texinfo, the GNU documentation system"
-set name=com.oracle.info.tpno value=9093
+set name=com.oracle.info.tpno value=7876
 set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -35,68 +39,23 @@
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest
-dir path=lib/svc/manifest/application
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/bin
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/locale
-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/eo
-dir path=usr/share/locale/eo/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/he
-dir path=usr/share/locale/he/LC_MESSAGES
-dir path=usr/share/locale/hr
-dir path=usr/share/locale/hr/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/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/no
-dir path=usr/share/locale/no/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/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/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_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/man/man5
-dir path=var
-dir path=var/info
+depend fmri=__TBD pkg.debug.depend.file=usr/bin/python type=require
+
+license texinfo.copyright license="GPLv3, FDLv1.3"
+
+legacy	pkg=SUNWtexi \
+	name="GNU texinfo - Texinfo utilities (texinfo)" \
+	desc="GNU texinfo (texinfo)"
+
 file texinfo-update.xml path=lib/svc/manifest/application/texinfo-update.xml
 file svc-texinfo-update path=lib/svc/method/svc-texinfo-update disable_fmri=svc:/application/texinfo-update:default
-file path=usr/bin/info
-file path=usr/bin/infokey
-file path=usr/bin/install-info
-file path=usr/bin/makeinfo
-file path=usr/bin/texi2dvi
 file texi2html.pl path=usr/bin/texi2html
-file path=usr/bin/texindex
+file usr/bin/$(MACH64)/info path=usr/bin/info
+file usr/bin/$(MACH64)/infokey path=usr/bin/infokey
+file usr/bin/$(MACH64)/install-info path=usr/bin/install-info
+file usr/bin/$(MACH64)/makeinfo path=usr/bin/makeinfo
+file usr/bin/$(MACH64)/texi2dvi path=usr/bin/texi2dvi
+file usr/bin/$(MACH64)/texindex path=usr/bin/texindex
 file path=usr/share/info/info-stnd.info
 file path=usr/share/info/info.info
 file path=usr/share/info/texinfo
@@ -106,19 +65,24 @@
 file path=usr/share/locale/cs/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/da/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/de/LC_MESSAGES/texinfo.mo
+#We don't ship locale/de_AT since it links to locale/de
+#file path=usr/share/locale/de_AT/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/eo/LC_MESSAGES/texinfo.mo
+file path=usr/share/locale/es/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/fr/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/he/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/hr/LC_MESSAGES/texinfo.mo
+file path=usr/share/locale/hu/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/ja/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/nb/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/nl/LC_MESSAGES/texinfo.mo
-file path=usr/share/locale/no/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/pl/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/ro/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/ru/LC_MESSAGES/texinfo.mo
+file path=usr/share/locale/rw/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/sv/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/tr/LC_MESSAGES/texinfo.mo
+file path=usr/share/locale/vi/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/texinfo.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/texinfo.mo
 file path=usr/share/man/man1/info.1
@@ -133,20 +97,5 @@
 file path=usr/share/texinfo/texinfo.dtd
 file path=usr/share/texinfo/texinfo.xsl
 file usr/share/info/dir path=var/info/usr_share_info_dir mode=0644 preserve=true
-link path=usr/sfw/bin/ginstall-info target=../../bin/install-info
-link path=usr/sfw/bin/info target=../../bin/info
-link path=usr/sfw/bin/install-info target=../../bin/install-info
-link path=usr/sfw/bin/makeinfo target=../../bin/makeinfo
-link path=usr/sfw/bin/texi2dvi target=../../bin/texi2dvi
-link path=usr/sfw/bin/texi2html target=../../bin/texi2html
-link path=usr/sfw/bin/texindex target=../../bin/texindex
-link path=usr/share/locale/de_AT target=de
 link path=usr/share/info/dir target=../../../var/info/usr_share_info_dir
-
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/python type=require
-
-license texinfo.copyright license="GPLv2, FDLv1.2"
-
-legacy	pkg=SUNWtexi \
-	name="GNU texinfo - Texinfo utilities (texinfo)" \
-	desc="GNU texinfo (texinfo)"
+link path=usr/share/locale/de_AT target=de