diff --git a/en/gnome/docs/gnome2_porting.sgml b/en/gnome/docs/gnome2_porting.sgml
index 8536051a9a..27c16a7d47 100644
--- a/en/gnome/docs/gnome2_porting.sgml
+++ b/en/gnome/docs/gnome2_porting.sgml
@@ -1,316 +1,328 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.2 2003/04/22 01:27:58 marcus Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.3 2003/06/16 20:13:13 marcus Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME 2 Components">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
   &header;
     <table border="0">
       <tr>
         <td>
 <!-- Begin USE_GNOME components list -->
           <table border="1">
 		    <tr>
 			  <th>COMPONENT</th>
 			  <th>ASSOCIATED PROGRAM</th>
 			  <th>IMPLIED COMPONENTS</th>
 			</tr>
 
 			<tr>
 			  <td><tt>atk</tt></td>
 			  <td><tt>devel/atk</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>atspi</tt></td>
 			  <td><tt>x11-toolkits/at-spi</tt></td>
 			  <td><tt>gail libbonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>bonoboactivation</tt></td>
 			  <td><tt>devel/bonoboactivation</tt></td>
 			  <td><tt>libxml2 orbit2</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>eel2</tt></td>
 			  <td><tt>x11-toolkits/eel2</tt></td>
 			  <td><tt>gnomevfs2 libgnomeui gail</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>esound</tt></td>
 			  <td><tt>audio/esound</tt></td>
 			  <td><tt></tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gail</tt></td>
 			  <td><tt>x11-toolkits/gail</tt></td>
 			  <td><tt>libgnomecanvas</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>gnometarget</tt></td>
+			  <td><tt>gnometarget pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomeaudio</tt></td>
 			  <td><tt>audio/gnomeaudio</tt></td>
 			  <td><tt></tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomecontrolcenter2</tt></td>
 			  <td><tt>sysutils/gnomecontrolcenter2</tt></td>
 			  <td><tt>gnomedesktop metacity</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedesktop</tt></td>
 			  <td><tt>x11/gnomedesktop</tt></td>
 			  <td><tt>libgnomeui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomehack</tt></td>
 			  <td colspan="2"><tt>gnomehack</tt> makes common GNOME
 			    Makefile substitutions that nearly every GNOME port
 				requires to fit into the proper mtree structure.  <b>Note</b>:
 				Including this option adds a <tt>pre-patch</tt> target to
 				your Makefile.  Therefore, only explicitly define
 				<tt>post-patch</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomehier</tt></td>
 			  <td colspan="2"><tt>gnomehier</tt> installs all the
 			    directories needed for both the GNOME 1 and 2 desktops.  
 				Only include this option if your port calls <tt>@dirrm</tt>
 				on one of the directories listed in the plist for
 				<tt>gnomehier</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomepanel</tt></td>
 			  <td><tt>x11/gnomepanel</tt></td>
 			  <td><tt>libwnck gnomedesktop</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomeprefix</tt></td>
 			  <td colspan="2"><tt>gnomeprefix</tt> sets some CONFIGURE_ARGS
 			    to ensure data is placed properly within the GNOME hierarchy.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnometarget</tt></td>
 			  <td colspan="2"><tt>gnometarget</tt> sets
 			    <tt>CONFIGURE_TARGET</tt> to
 				<tt>--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomevfs2</tt></td>
 			  <td><tt>devel/gnomevfs2</tt></td>
 			  <td><tt>gconf2 libbonobo gnomemimedata</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtk20</tt></td>
 			  <td><tt>x11-toolkits/gtk20</tt></td>
 			  <td><tt>atk pango</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>gtksourceview</tt></td>
 			  <td><tt>x11-toolkits/gtksourceview</tt></td>
 			  <td><tt>libgnome</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libartlgpl2</tt></td>
 			  <td><tt>graphics/libartlgpl2</tt></td>
-			  <td><tt></tt></td>
+			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libbonobo</tt></td>
 			  <td><tt>devel/libbonobo</tt></td>
 			  <td><tt>bonoboactivation</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>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>libxslt gnomevfs2 esound</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>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 libgda2</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>libgsf</tt></td>
+			  <td><tt>devel/libgsf</tt></td>
+			  <td><tt>gnomevfs2 libbonobo</tt></td>
+			</tr>
+
 			<tr>
 			  <td><tt>libgtkhtml</tt></td>
 			  <td><tt>www/libgtkhtml</tt></td>
 			  <td><tt>libxslt gnomevfs2 gail</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libidl</tt></td>
 			  <td><tt>devel/libIDL</tt></td>
 			  <td><tt>glib20</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>librsvg2</tt></td>
 			  <td><tt>graphics/librsvg2</tt></td>
-			  <td><tt>gtk20</tt></td>
+			  <td><tt>gtk20 libgsf</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libxml2</tt></td>
 			  <td><tt>textproc/libxml2</tt></td>
-			  <td><tt></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>nautilus2</tt></td>
 			  <td><tt>x11-fm/nautilus</tt></td>
 			  <td><tt>librsvg2 eel2 gnomedesktop gnomecontrolcenter</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>metacity</tt></td>
 			  <td><tt>x11-wm/metacity</tt></td>
 			  <td><tt>gconf2 glade2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>orbit2</tt></td>
 			  <td><tt>devel/ORBit2</tt></td>
 			  <td><tt>libidl linc</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>pkgconfig</tt></td>
+			  <td><tt>devel/pkgconfig</tt></td>
+			  <td><tt></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>
         </td>
       </tr>
     </table>
 
   &footer;
   </body>
 </html>
diff --git a/en/gnome/docs/gnome_porting.sgml b/en/gnome/docs/gnome_porting.sgml
index c3246b50d2..e2e5bb3e28 100644
--- a/en/gnome/docs/gnome_porting.sgml
+++ b/en/gnome/docs/gnome_porting.sgml
@@ -1,206 +1,206 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome_porting.sgml,v 1.1 2003/04/20 22:49:27 adamw Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome_porting.sgml,v 1.2 2003/04/22 01:27:58 marcus Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME 1 Components">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
   &header;
     <table border="0">
       <tr>
         <td>
 <!-- Begin USE_GNOME components list -->
           <table border="1">
 		    <tr>
 			  <th>COMPONENT</th>
 			  <th>ASSOCIATED PROGRAM</th>
 			  <th>IMPLIED COMPONENTS</th>
 			</tr>
 
 			<tr>
 			  <td><tt>bonobo</tt></td>
 			  <td><tt>devel/bonobo</tt></td>
 			  <td><tt>oaf gnomeprint</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>esound</tt></td>
 			  <td><tt>audio/esound</tt></td>
 			  <td><tt></tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gal</tt></td>
 			  <td><tt>x11-toolkits/gal</tt></td>
 			  <td><tt>libglade</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gconf</tt></td>
 			  <td><tt>devel/gconf</tt></td>
 			  <td><tt>oaf</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gdkpixbuf</tt></td>
 			  <td><tt>graphics/gdk-pixbuf</tt></td>
 			  <td><tt>gtk12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>glib12</tt></td>
 			  <td><tt>devel/glib12</tt></td>
-			  <td><tt></tt></td>
+			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>glibwww</tt></td>
 			  <td><tt>www/glibwww</tt></td>
 			  <td><tt>gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomecanvas</tt></td>
 			  <td><tt>graphics/gnomecanvas</tt></td>
 			  <td><tt>gnomelibs gdkpixbuf</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedb</tt></td>
 			  <td><tt>databases/gnomedb</tt></td>
 			  <td><tt>libgda</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomehack</tt></td>
 			  <td colspan="2"><tt>gnomehack</tt> makes common GNOME
 			    Makefile substitutions that nearly every GNOME port
 				requires to fit into the proper mtree structure.  <b>Note</b>:
 				Including this option adds a <tt>pre-patch</tt> target to
 				your Makefile.  Therefore, only explicitly define
 				<tt>post-patch</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomehier</tt></td>
 			  <td colspan="2"><tt>gnomehier</tt> installs all the
 			    directories needed for both the GNOME 1 and 2 desktops.  
 				Only include this option if your port calls <tt>@dirrm</tt>
 				on one of the directories listed in the plist for
 				<tt>gnomehier</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomelibs</tt></td>
 			  <td><tt>x11/gnomelibs</tt></td>
 			  <td><tt>esound imlib libxml orbit</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomemimedata</tt></td>
 			  <td><tt>misc/gnomemimedata</tt></td>
-			  <td><tt>gnomehier</tt></td>
+			  <td><tt>gnomehier pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomeprefix</tt></td>
 			  <td colspan="2"><tt>gnomeprefix</tt> sets some CONFIGURE_ARGS
 			    to ensure data is placed properly within the GNOME hierarchy.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomeprint</tt></td>
 			  <td><tt>print/gnomeprint</tt></td>
 			  <td><tt>gnomelibs gnomecanvas</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomevfs</tt></td>
 			  <td><tt>devel/gnomevfs</tt></td>
 			  <td><tt>gnomemimedata gconf gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtk12</tt></td>
 			  <td><tt>x11-toolkits/gtk12</tt></td>
 			  <td><tt>glib12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtkhtml</tt></td>
 			  <td><tt>www/gtkhtml</tt></td>
 			  <td><tt>glibwww gal libghttp libcapplet</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>imlib</tt></td>
 			  <td><tt>graphics/imlib</tt></td>
 			  <td><tt>gtk12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libcapplet</tt></td>
 			  <td><tt>x11/libcapplet</tt></td>
 			  <td><tt>gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgda</tt></td>
 			  <td><tt>databases/libgda</tt></td>
 			  <td><tt>gconf bonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libghttp</tt></td>
 			  <td><tt>www/libghttp</tt></td>
 			  <td><tt></tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libglade</tt></td>
 			  <td><tt>devel/libglade</tt></td>
 			  <td><tt>gnomedb</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libpanel</tt></td>
 			  <td><tt>x11/libpanel</tt></td>
 			  <td><tt>gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libxml</tt></td>
 			  <td><tt>textproc/libxml</tt></td>
 			  <td><tt>glib12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>oaf</tt></td>
 			  <td><tt>devel/oaf</tt></td>
 			  <td><tt>orbit libxml</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>orbit</tt></td>
 			  <td><tt>devel/ORBit</tt></td>
 			  <td><tt>glib12</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>
         </td>
       </tr>
     </table>
 
   &footer;
   </body>
 </html>
