diff --git a/en/gnome/docs/gnome2_porting.sgml b/en/gnome/docs/gnome2_porting.sgml
index 0582d1dd90..312ee2d7e0 100644
--- a/en/gnome/docs/gnome2_porting.sgml
+++ b/en/gnome/docs/gnome2_porting.sgml
@@ -1,406 +1,406 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.32 2009/01/13 04:57:59 mezz Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.33 2009/04/11 19:50:49 marcus Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME 2 Components">
 <!ENTITY email "freebsd-gnome">
 <!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 <html>
   &header;
 
 		<p> To see how to utilize these components, please examine the
 		  <a href="example-Makefile.html">example Makefile</a>.
 		</p>
 
 
 <!-- Begin USE_GNOME components list -->
 	  <table class="tblbasic" summary="GNOME 2 components">
 		    <tr>
 			  <th>COMPONENT</th>
 			  <th>ASSOCIATED PROGRAM</th>
 			  <th>IMPLIED COMPONENTS</th>
 			</tr>
 
 			<tr>
 			  <td><tt>atk</tt></td>
 			  <td><tt>accessibility/atk</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>atspi</tt></td>
 			  <td><tt>accessibility/at-spi</tt></td>
 			  <td><tt>gtk20 libbonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>desktopfileutils</tt></td>
 			  <td><tt>devel/desktop-file-utils</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>eel2</tt></td>
 			  <td><tt>x11-toolkits/eel</tt></td>
 			  <td><tt>gnomedesktop</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>evolutiondataserver</tt></td>
 			  <td><tt>databases/evolution-data-server</tt></td>
 			  <td><tt>libgnomeui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gal2</tt></td>
 			  <td><tt>x11-toolkits/gal2</tt></td>
 			  <td><tt>gnomeui libgnomeprintui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gconf2</tt></td>
 			  <td><tt>devel/gconf2</tt></td>
 			  <td><tt>orbit2 libxml2 gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>_glib20</tt></td>
 			  <td><tt>devel/glib20</tt></td>
 			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>glib20</tt></td>
 			  <td><tt>devel/gio-fam-backend</tt></td>
 			  <td><tt>_glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomecontrolcenter2</tt></td>
 			  <td><tt>sysutils/gnome-control-center</tt></td>
-			  <td><tt>metacity nautilus2 gnomemenus
-			    desktopfileutils libgnomekbd gnomepanel</tt></td>
+			  <td><tt>metacity gnomemenus desktopfileutils
+			  libgnomekbd gnomedesktop librsvg2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedesktop</tt></td>
 			  <td><tt>x11/gnome-desktop</tt></td>
-			  <td><tt>libgnomeui gnomedocutils</tt></td>
+			  <td><tt>gconf2 gnomedocutils pygtk2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedesktopsharp20</tt></td>
 			  <td><tt>x11-toolkits/gnome-desktop-sharp20</tt></td>
 			  <td><tt>gnomesharp20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedocutils</tt></td>
 			  <td><tt>textproc/gnome-doc-utils</tt></td>
 			  <td><tt>libxslt</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomemenus</tt></td>
 			  <td><tt>x11/gnome-menus</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomepanel</tt></td>
 			  <td><tt>x11/gnome-panel</tt></td>
 			  <td><tt>gnomedesktop libwnck gnomemenus
-			     gnomedocutils librsvg2</tt></td>
+			  gnomedocutils librsvg2 libgnomeui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomesharp20</tt></td>
 			  <td><tt>x11-toolkits/gnome-sharp20</tt></td>
 			  <td><tt>gnomepanel gtkhtml3 gtksharp20
 			    librsvg2 vte</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomespeech</tt></td>
 			  <td><tt>accessibility/gnome-speech</tt></td>
 			  <td><tt>libbonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomevfs2</tt></td>
 			  <td><tt>devel/gnome-vfs</tt></td>
 			  <td><tt>gconf2 gnomemimedata</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtk20</tt></td>
 			  <td><tt>x11-toolkits/gtk20</tt></td>
 			  <td><tt>intltool atk pango</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtkhtml3</tt></td>
 			  <td><tt>www/gtkhtml3</tt></td>
 			  <td><tt>libgnomeui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtksharp10</tt></td>
 			  <td><tt>x11-toolkits/gtk-sharp10</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtksharp20</tt></td>
 			  <td><tt>x11-toolkits/gtk-sharp20</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtksourceview</tt></td>
 			  <td><tt>x11-toolkits/gtksourceview</tt></td>
 			  <td><tt>libgnome libgnomeprintui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtksourceview2</tt></td>
 			  <td><tt>x11-toolkits/gtksourceview2</tt></td>
 			  <td><tt>gtk20 libxml2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gvfs</tt></td>
 			  <td><tt>devel/gvfs</tt></td>
 			  <td><tt>glib20 gconf2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libartlgpl2</tt></td>
 			  <td><tt>graphics/libart_lgpl</tt></td>
 			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libbonobo</tt></td>
 			  <td><tt>devel/libbonobo</tt></td>
 			  <td><tt>libxml2 orbit2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libbonoboui</tt></td>
 			  <td><tt>x11-toolkits/libbonoboui</tt></td>
 			  <td><tt>libgnomecanvas libgnome</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgailgnome</tt></td>
 			  <td><tt>x11-toolkits/libgail-gnome</tt></td>
 			  <td><tt>libgnomeui atspi</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgda2</tt></td>
 			  <td><tt>databases/libgda2</tt></td>
 			  <td><tt>glib20 libxslt</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgda3</tt></td>
 			  <td><tt>databases/libgda3</tt></td>
 			  <td><tt>glib20 libxslt</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgda4</tt></td>
 			  <td><tt>databases/libgda4</tt></td>
 			  <td><tt>glib20 libxslt</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libglade2</tt></td>
 			  <td><tt>devel/libglade2</tt></td>
 			  <td><tt>libxml2 gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnome</tt></td>
 			  <td><tt>x11/libgnome</tt></td>
 			  <td><tt>gnomevfs2 esound libbonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomecanvas</tt></td>
 			  <td><tt>graphics/libgnomecanvas</tt></td>
 			  <td><tt>libglade2 libartlgpl2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomedb</tt></td>
 			  <td><tt>databases/libgnomedb</tt></td>
 			  <td><tt>libgnomeui libgda3</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomekbd</tt></td>
 			  <td><tt>x11/libgnomekbd</tt></td>
-			  <td><tt>libgnomeui</tt></td>
+			  <td><tt>gconf2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomeprint</tt></td>
 			  <td><tt>print/libgnomeprint</tt></td>
 			  <td><tt>libbonobo libartlgpl2 gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomeprintui</tt></td>
 			  <td><tt>x11-toolkits/libgnomeprintui</tt></td>
 			  <td><tt>libgnomeprint libgnomecanvas</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomeui</tt></td>
 			  <td><tt>x11-toolkits/libgnomeui</tt></td>
 			  <td><tt>libbonoboui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgsf</tt></td>
 			  <td><tt>devel/libgsf</tt></td>
 			  <td><tt>gconf2 glib20 libxml2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgsf_gnome</tt></td>
 			  <td><tt>devel/libgsf-gnome</tt></td>
 			  <td><tt>libgsf gnomevfs2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgtkhtml</tt></td>
 			  <td><tt>www/libgtkhtml</tt></td>
 			  <td><tt>libxslt gnomevfs2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libidl</tt></td>
 			  <td><tt>devel/libIDL</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>librsvg2</tt></td>
 			  <td><tt>graphics/librsvg2</tt></td>
 			  <td><tt>libgsf gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libwnck</tt></td>
 			  <td><tt>x11-toolkits/libwnck</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libxml2</tt></td>
 			  <td><tt>textproc/libxml2</tt></td>
 			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libxslt</tt></td>
 			  <td><tt>textproc/libxslt</tt></td>
 			  <td><tt>libxml2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libzvt</tt></td>
 			  <td><tt>x11-toolkits/libzvt</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>linc</tt></td>
 			  <td><tt>net/linc</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>metacity</tt></td>
 			  <td><tt>x11-wm/metacity</tt></td>
 			  <td><tt>gconf2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>nautilus2</tt></td>
 			  <td><tt>x11-fm/nautilus</tt></td>
 			  <td><tt>librsvg2 gnomedesktop
 			    desktopfileutils gvfs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>nautiluscdburner</tt></td>
 			  <td><tt>sysutils/nautilus-cd-burner</tt></td>
 			  <td><tt>nautilus2 eel2 desktopfileutils</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>orbit2</tt></td>
 			  <td><tt>devel/ORBit2</tt></td>
 			  <td><tt>libidl</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pango</tt></td>
 			  <td><tt>x11-toolkits/pango</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pygnome2</tt></td>
 			  <td><tt>x11-toolkits/py-gnome2</tt></td>
 			  <td><tt>libgnomeui pygtk2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pygnomedesktop</tt></td>
 			  <td><tt>x11-toolkits/py-gnome-desktop</tt></td>
 			  <td><tt>pygnome2 libgnomeprintui
 			    gtksourceview gnomepanel libwnck
 			    nautilus2 metacity</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pygnomeextras</tt></td>
 			  <td><tt>x11-toolkits/py-gnome-extras</tt></td>
 			  <td><tt>pygnome2 libgtkhtml</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pygtk2</tt></td>
 			  <td><tt>x11-toolkits/py-gtk2</tt></td>
 			  <td><tt>libglade2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pygtksourceview</tt></td>
 			  <td><tt>x11-toolkits/py-gtksourceview</tt></td>
 			  <td><tt>gtksourceview2 pygtk2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>vte</tt></td>
 			  <td><tt>x11-toolkits/vte</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 		  </table>
 <!-- End GNOME-related Makefile macros -->
 
           <p>If you still need help with your port, have a look at some of
 	    the <a href="/ports/gnome.html">existing ports</a> for examples.
 	    The <a href="mailto:&email;@FreeBSD.org">freebsd-gnome mailing
 	    list</a> is also there for you.</p>
 
   &footer;
   </body>
 </html>

COMPONENT	ASSOCIATED PROGRAM	IMPLIED COMPONENTS
`atk`	`accessibility/atk`	`glib20`
`atspi`	`accessibility/at-spi`	`gtk20 libbonobo`
`desktopfileutils`	`devel/desktop-file-utils`	`glib20`
`eel2`	`x11-toolkits/eel`	`gnomedesktop`
`evolutiondataserver`	`databases/evolution-data-server`	`libgnomeui`
`gal2`	`x11-toolkits/gal2`	`gnomeui libgnomeprintui`
`gconf2`	`devel/gconf2`	`orbit2 libxml2 gtk20`
`_glib20`	`devel/glib20`	`pkgconfig`
`glib20`	`devel/gio-fam-backend`	`_glib20`
`gnomecontrolcenter2`	`sysutils/gnome-control-center`	`metacity nautilus2 gnomemenus - desktopfileutils libgnomekbd gnomepanel`	`metacity gnomemenus desktopfileutils + libgnomekbd gnomedesktop librsvg2`
`gnomedesktop`	`x11/gnome-desktop`	`libgnomeui gnomedocutils`	`gconf2 gnomedocutils pygtk2`
`gnomedesktopsharp20`	`x11-toolkits/gnome-desktop-sharp20`	`gnomesharp20`
`gnomedocutils`	`textproc/gnome-doc-utils`	`libxslt`
`gnomemenus`	`x11/gnome-menus`	`glib20`
`gnomepanel`	`x11/gnome-panel`	`gnomedesktop libwnck gnomemenus - gnomedocutils librsvg2`
`gnomesharp20`	`x11-toolkits/gnome-sharp20`	`gnomepanel gtkhtml3 gtksharp20 librsvg2 vte`
`gnomespeech`	`accessibility/gnome-speech`	`libbonobo`
`gnomevfs2`	`devel/gnome-vfs`	`gconf2 gnomemimedata`
`gtk20`	`x11-toolkits/gtk20`	`intltool atk pango`
`gtkhtml3`	`www/gtkhtml3`	`libgnomeui`
`gtksharp10`	`x11-toolkits/gtk-sharp10`	`gtk20`
`gtksharp20`	`x11-toolkits/gtk-sharp20`	`gtk20`
`gtksourceview`	`x11-toolkits/gtksourceview`	`libgnome libgnomeprintui`
`gtksourceview2`	`x11-toolkits/gtksourceview2`	`gtk20 libxml2`
`gvfs`	`devel/gvfs`	`glib20 gconf2`
`libartlgpl2`	`graphics/libart_lgpl`	`pkgconfig`
`libbonobo`	`devel/libbonobo`	`libxml2 orbit2`
`libbonoboui`	`x11-toolkits/libbonoboui`	`libgnomecanvas libgnome`
`libgailgnome`	`x11-toolkits/libgail-gnome`	`libgnomeui atspi`
`libgda2`	`databases/libgda2`	`glib20 libxslt`
`libgda3`	`databases/libgda3`	`glib20 libxslt`
`libgda4`	`databases/libgda4`	`glib20 libxslt`
`libglade2`	`devel/libglade2`	`libxml2 gtk20`
`libgnome`	`x11/libgnome`	`gnomevfs2 esound libbonobo`
`libgnomecanvas`	`graphics/libgnomecanvas`	`libglade2 libartlgpl2`
`libgnomedb`	`databases/libgnomedb`	`libgnomeui libgda3`
`libgnomekbd`	`x11/libgnomekbd`	`libgnomeui`	`gconf2`
`libgnomeprint`	`print/libgnomeprint`	`libbonobo libartlgpl2 gtk20`
`libgnomeprintui`	`x11-toolkits/libgnomeprintui`	`libgnomeprint libgnomecanvas`
`libgnomeui`	`x11-toolkits/libgnomeui`	`libbonoboui`
`libgsf`	`devel/libgsf`	`gconf2 glib20 libxml2`
`libgsf_gnome`	`devel/libgsf-gnome`	`libgsf gnomevfs2`
`libgtkhtml`	`www/libgtkhtml`	`libxslt gnomevfs2`
`libidl`	`devel/libIDL`	`glib20`
`librsvg2`	`graphics/librsvg2`	`libgsf gtk20`
`libwnck`	`x11-toolkits/libwnck`	`gtk20`
`libxml2`	`textproc/libxml2`	`pkgconfig`
`libxslt`	`textproc/libxslt`	`libxml2`
`libzvt`	`x11-toolkits/libzvt`	`gtk20`
`linc`	`net/linc`	`glib20`
`metacity`	`x11-wm/metacity`	`gconf2`
`nautilus2`	`x11-fm/nautilus`	`librsvg2 gnomedesktop desktopfileutils gvfs`
`nautiluscdburner`	`sysutils/nautilus-cd-burner`	`nautilus2 eel2 desktopfileutils`
`orbit2`	`devel/ORBit2`	`libidl`
`pango`	`x11-toolkits/pango`	`glib20`
`pygnome2`	`x11-toolkits/py-gnome2`	`libgnomeui pygtk2`
`pygnomedesktop`	`x11-toolkits/py-gnome-desktop`	`pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautilus2 metacity`
`pygnomeextras`	`x11-toolkits/py-gnome-extras`	`pygnome2 libgtkhtml`
`pygtk2`	`x11-toolkits/py-gtk2`	`libglade2`
`pygtksourceview`	`x11-toolkits/py-gtksourceview`	`gtksourceview2 pygtk2`
`vte`	`x11-toolkits/vte`	`gtk20`