--- a/components/texinfo/texinfo.p5m	Sun Jan 22 10:33:31 2012 -0800
+++ b/components/texinfo/texinfo.p5m	Tue Jan 24 07:17:12 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+$ -> default mangler.man.stability volatile>
@@ -42,8 +42,6 @@
 dir path=usr/bin
 dir path=usr/sfw
 dir path=usr/sfw/bin
-dir path=usr/sfw/share
-dir path=usr/sfw/share/info
 dir path=usr/share
 dir path=usr/share/info
 dir path=usr/share/locale
@@ -132,8 +130,7 @@
 file path=usr/share/texinfo/texinfo.cat
 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 editable=true preserve=true
-file usr/share/info/dir path=var/info/usr_sfw_share_info_dir mode=0644 editable=true preserve=true
+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
@@ -143,7 +140,6 @@
 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
-link path=usr/sfw/share/info/dir target=../../../../var/info/usr_sfw_share_info_dir
 
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/python type=require