--- a/components/gcc3/gcc-3.p5m	Sun Jan 22 10:33:31 2012 -0800
+++ b/components/gcc3/gcc-3.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 >
@@ -98,6 +98,8 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man7
+dir path=var
+dir path=var/info
 
 file path=usr/sfw/bin/$(GNU_ARCH)-g++
 file path=usr/sfw/bin/$(GNU_ARCH)-gcc-3.4.3
@@ -436,6 +438,7 @@
 file fsf-funding.7 path=usr/sfw/share/man/man7/fsf-funding.7
 file gfdl.7 path=usr/sfw/share/man/man7/gfdl.7
 file gpl.7 path=usr/sfw/share/man/man7/gpl.7
+file usr/sfw/share/info/dir path=var/info/usr_sfw_share_info_dir mode=0644 preserve=true pkg.linted.pkglint.dupaction001.1=true
 
 hardlink path=usr/sfw/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
 hardlink path=usr/sfw/bin/$(GNU_ARCH)-gcc target=$(GNU_ARCH)-gcc-3.4.3
@@ -475,6 +478,7 @@
 #    target=../../../sfw/share/man/man7/fsf-funding.7
 #link path=usr/share/man/man7/gfdl.7 target=../../../sfw/share/man/man7/gfdl.7
 #link path=usr/share/man/man7/gpl.7 target=../../../sfw/share/man/man7/gpl.7
+link path=usr/sfw/share/info/dir target=../../../../var/info/usr_sfw_share_info_dir
 
 license gcc.license license="GPLv2"
 

--- a/components/texinfo/Makefile	Sun Jan 22 10:33:31 2012 -0800
+++ b/components/texinfo/Makefile	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.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -34,8 +34,17 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+INFOPATH := /usr/share/info
+INFOPATH := $(INFOPATH):/usr/sfw/share/info
+INFOPATH := $(INFOPATH):/usr/gnu/share/info
+INFOPATH := $(INFOPATH):/usr/local/share/info
+INFOPATH := $(INFOPATH):.
+
+CPPFLAGS += -DDEFAULT_INFOPATH=\\\"$(INFOPATH)\\\"
+
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS  +=		CPPFLAGS="$(CPPFLAGS)"
 
 # common targets
 build:		$(BUILD_32)

--- 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