Update to GNOME 1.4 -- massive changes all around, for the sake of

CVS repo bloat, I'll only list the updates.

  graphics/imlib		1.9.9  -> 1.9.10
  textproc/xml-i18n-tools	0.8    -> 0.8.1
  x11/gnomelibs			1.2.11 -> 1.2.13
  devel/oaf			0.6.2  -> 0.6.5
  devel/gconf			0.12   -> 1.0.0
  devel/gnomevfs		0.5    -> 1.0
  graphics/gdk-pixbuf		0.9.0  -> 0.11.0
  sysutils/gnomecontrolcenter	1.2.2  -> 1.4.0.1
  print/gnomeprint		0.25   -> 0.28
  devel/bonobo			0.37   -> 1.0.3
  audio/gnomeaudio		1.0.0  -> 1.4.0
  x11/gnomecore			1.2.4  -> 1.4.0.3
  devel/libgtop			1.0.11 -> 1.0.12
  x11/gnomeapplets		1.2.4  -> 1.4.0.1
  misc/gnomeuserdocs		          NEW 1.4.1
  misc/gnomeutils		1.2.1  -> 1.4.0
  deskutils/gnomepim		1.2.0  -> 1.4.0
  games/gnomegames		1.2.0  -> 1.4.0.1
  print/ggv			0.95   -> 1.0
  editors/ghex			1.1.4  -> 1.2
  devel/bugbuddy		1.2    -> 2.0.1
  devel/glade			0.5.11 -> 0.6.2
  sysutils/gtop			1.0.12 -> 1.0.13
  x11/xalf			          NEW 0.11
  x11-toolkits/py-gtk		0.6.6  -> 0.6.7
  x11-toolkits/py-gnome		1.0.53 -> 1.4.0
  x11-toolkits/guile-gtk	0.19   -> 0.20
  x11-toolkits/guile-gnome	0.10   -> 0.20
  devel/libsigc++		1.0.1  -> 1.0.3
  x11-toolkits/gnome--		1.1.15 -> 1.1.17
  x11-toolkits/panel--		          NEW 0.1
  x11-fm/gnomemc		4.5.51 -> 4.5.54

1 files changed, 21 insertions, 8 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index ddbbab61dece..1f5fdcc55136 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -186,11 +186,24 @@ pre-everything::
 # USE_GNOMECTRL	- Says that the port uses the GNOME control center.
 # USE_GNOME		- Says that the port uses the GNOME desktop environment.
 
-# Ports outside of the offical GNOME distribution should probably not be
-# using USE_GNOMELIBS or USE_GNOMECTRL, unless they have a very good reason. 
-# Most GNOME ports require USE_GNOME for the correct remove of directories
-# in ${X11BASE}/share/gnome.  Ports using GNOME should also have
-# USE_X_PREFIX defined.
+# These are the only "entry points" into the GNOME distribution that will
+# be supported.  If you need to use a port that is (say) part of
+# the controlcenter metaport, then simply request USE_GNOMECTRL=YES.
+#
+# Any explicit depends on any of the ports that make up the x11/gnome
+# metaport will be periodically eradicated by marking the port BROKEN.
+# Please use the guidelines above to help everybody maintain a cohesive
+# FreeBSD/GNOME environment.
+#
+# Unless you're experienced with the GNOME system, we highly recommend
+# simply using USE_GNOME=yes if you have GNOME related ports you wish
+# to commit.  This will certainly be a *guaranteed* interface that won't
+# be broken without significant warning.  Practically all of your target
+# audience will already have the x11/gnome metaport installed, so there
+# will be minimal inconvenience in terms of excessive downloads.
+#
+# Ports using GNOME should also have USE_X_PREFIX defined.
+# (Perhaps we should add it??  XXX: aDe)
  
 .if defined(USE_GNOME)
 USE_GNOMECTRL=	yes
@@ -274,7 +287,7 @@ CONFIGURE_ARGS+=--localstatedir=${PREFIX}/share/gnome
 .if !defined(HAVE_GNOME) || ${CONFIGURE_ARGS:S/--datadir=//} == ${CONFIGURE_ARGS}
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gnome
 .endif
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS+=	gnome.5:${PORTSDIR}/x11/gnomelibs
 GNOME_CONFIG?=	${X11BASE}/bin/gnome-config
 CONFIGURE_ENV+=	GNOME_CONFIG="${GNOME_CONFIG}"
 MAKE_ENV+=		GNOME_CONFIG="${GNOME_CONFIG}"
@@ -286,10 +299,10 @@ PLIST_SUB+=		GNOME:="" NOGNOME:="@comment " DATADIR="share/gnome"
 .endif
 .endif
 .if defined(USE_GNOMECTRL)
-LIB_DEPENDS+=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
+LIB_DEPENDS+=	capplet.5:${PORTSDIR}/sysutils/gnomecontrolcenter
 .endif
 .if defined(USE_GNOME)
-LIB_DEPENDS+=	panel_applet.4:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS+=	panel_applet.5:${PORTSDIR}/x11/gnomecore
 .endif
 .if defined(WANT_GNOME) && !defined(HAVE_GNOME)
 PLIST_SUB+=		GNOME:="@comment " NOGNOME:="" DATADIR="share"