25 files changed, 305 insertions, 142 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index a6e1f48cdbbf..d78a3a906df2 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -15,7 +14,8 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 9de7feb0edf2..2d889c5c8570 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.2.2.tar.gz) = 13687951e810f536b87c3cf29cc61c07
+MD5 (control-center-1.4.0.1.tar.gz) = 53e3d628a0d53a4b74e1ae8d8cb057ff
diff --git a/sysutils/gnome-control-center/files/patch-bn b/sysutils/gnome-control-center/files/patch-bn
index 96c34a77aa91..294e18fe95ed 100644
--- a/sysutils/gnome-control-center/files/patch-bn
+++ b/sysutils/gnome-control-center/files/patch-bn
@@ -8,7 +8,7 @@
 @@ -168,3 +168,3 @@
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 4:0:0
++libcapplet_la_LDFLAGS = -version-info 5:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
 @@ -590,2 +590,3 @@
  	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 66866c527d9c..a2007948fbb8 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,11 +1,10 @@
 bin/background-properties-capplet
+bin/file-types-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
-bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
-bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -16,7 +15,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.4
+lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
@@ -24,7 +23,6 @@ share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
 share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-share/gnome/apps/Settings/Documents/mime-type.desktop
 share/gnome/apps/Settings/Documents/url-properties.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
@@ -32,11 +30,8 @@ share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/Session/session-properties.desktop
 share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/UIOptions/application.desktop
-share/gnome/apps/Settings/UIOptions/dialogs.desktop
-share/gnome/apps/Settings/UIOptions/mdi.desktop
+share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
@@ -51,10 +46,15 @@ share/gnome/control-center/.data/Bubble3d.desktop
 share/gnome/control-center/.data/Bubbles.desktop
 share/gnome/control-center/.data/Bumps.desktop
 share/gnome/control-center/.data/Cage.desktop
+share/gnome/control-center/.data/Compass.desktop
 share/gnome/control-center/.data/Coral.desktop
+share/gnome/control-center/.data/Critical.desktop
+share/gnome/control-center/.data/Crystal.desktop
+share/gnome/control-center/.data/crystal.png
 share/gnome/control-center/.data/Cynosure.desktop
 share/gnome/control-center/.data/Decayscreen.desktop
 share/gnome/control-center/.data/Deco.desktop
+share/gnome/control-center/.data/Deluxe.desktop
 share/gnome/control-center/.data/Demon.desktop
 share/gnome/control-center/.data/Discrete.desktop
 share/gnome/control-center/.data/Distort.desktop
@@ -98,6 +98,7 @@ share/gnome/control-center/.data/Mountain.desktop
 share/gnome/control-center/.data/Munch.desktop
 share/gnome/control-center/.data/Noseguy.desktop
 share/gnome/control-center/.data/Pedal.desktop
+share/gnome/control-center/.data/Penetrate.desktop
 share/gnome/control-center/.data/Penrose.desktop
 share/gnome/control-center/.data/Phosphor.desktop
 share/gnome/control-center/.data/Pipes.desktop
@@ -116,7 +117,9 @@ share/gnome/control-center/.data/Slip.desktop
 share/gnome/control-center/.data/Sonar.desktop
 share/gnome/control-center/.data/Sphere.desktop
 share/gnome/control-center/.data/Spiral.desktop
+share/gnome/control-center/.data/Spotlight.desktop
 share/gnome/control-center/.data/Sproingies.desktop
+share/gnome/control-center/.data/Squiral.desktop
 share/gnome/control-center/.data/Stairs.desktop
 share/gnome/control-center/.data/Starfish.desktop
 share/gnome/control-center/.data/Strange.desktop
@@ -126,6 +129,7 @@ share/gnome/control-center/.data/Triangle.desktop
 share/gnome/control-center/.data/Truchet.desktop
 share/gnome/control-center/.data/Vines.desktop
 share/gnome/control-center/.data/Worm.desktop
+share/gnome/control-center/.data/Xflame.desktop
 share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xmatrix.desktop
@@ -181,8 +185,8 @@ share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
+share/gnome/control-center/Documents/file-types-capplet.desktop
 share/gnome/control-center/Documents/gnome-edit-properties.desktop
-share/gnome/control-center/Documents/mime-type.desktop
 share/gnome/control-center/Documents/url-properties.desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/sound-properties.desktop
@@ -190,31 +194,61 @@ share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
 share/gnome/control-center/Session/.directory
-share/gnome/control-center/Session/session-properties.desktop
 share/gnome/control-center/UIOptions/.directory
 share/gnome/control-center/UIOptions/application.desktop
 share/gnome/control-center/UIOptions/dialogs.desktop
 share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/figs/bg-capplet.png
-share/gnome/help/control-center/C/figs/gccappdef.png
-share/gnome/help/control-center/C/figs/gccdialog.png
-share/gnome/help/control-center/C/figs/gccedit.png
-share/gnome/help/control-center/C/figs/gcchints.png
-share/gnome/help/control-center/C/figs/gccmdi.png
-share/gnome/help/control-center/C/figs/gccmime.png
-share/gnome/help/control-center/C/figs/gccsession-props.png
-share/gnome/help/control-center/C/figs/gccsound1.png
-share/gnome/help/control-center/C/figs/gccsound2.png
-share/gnome/help/control-center/C/figs/gccstartup.png
-share/gnome/help/control-center/C/figs/gccurl.png
-share/gnome/help/control-center/C/figs/glob_pref_anim.png
-share/gnome/help/control-center/C/figs/keyboard-capplet.png
-share/gnome/help/control-center/C/figs/mouse-capplet.png
-share/gnome/help/control-center/C/figs/screensave-capplet.png
-share/gnome/help/control-center/C/figs/theme-select.png
-share/gnome/help/control-center/C/figs/wm-main.png
+share/gnome/help/control-center/C/alf.html
+share/gnome/help/control-center/C/authors.html
+share/gnome/help/control-center/C/desktop-intro.html
+share/gnome/help/control-center/C/control-center.sgml
+share/gnome/help/control-center/C/doc-handlers.html
+share/gnome/help/control-center/C/docbook.css
+share/gnome/help/control-center/C/figures/bg-capplet.png
+share/gnome/help/control-center/C/figures/gccalf.png
+share/gnome/help/control-center/C/figures/gccappdef.png
+share/gnome/help/control-center/C/figures/gccdialog.png
+share/gnome/help/control-center/C/figures/gccedit.png
+share/gnome/help/control-center/C/figures/gcchints.png
+share/gnome/help/control-center/C/figures/gccmdi.png
+share/gnome/help/control-center/C/figures/gccmime.png
+share/gnome/help/control-center/C/figures/gccsession-props.png
+share/gnome/help/control-center/C/figures/gccsessopt.png
+share/gnome/help/control-center/C/figures/gccsound1.png
+share/gnome/help/control-center/C/figures/gccsound2.png
+share/gnome/help/control-center/C/figures/gccstartup.png
+share/gnome/help/control-center/C/figures/gccurl.png
+share/gnome/help/control-center/C/figures/glob_pref_anim.png
+share/gnome/help/control-center/C/figures/keyboard-capplet.png
+share/gnome/help/control-center/C/figures/mouse-capplet.png
+share/gnome/help/control-center/C/figures/screensave-capplet.png
+share/gnome/help/control-center/C/figures/theme-select.png
+share/gnome/help/control-center/C/figures/wm-add.png
+share/gnome/help/control-center/C/figures/wm-main.png
+share/gnome/help/control-center/C/filetypes.html
+share/gnome/help/control-center/C/gccui.html
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/license.html
+share/gnome/help/control-center/C/ln7.html
+share/gnome/help/control-center/C/multimedia-intro.html
+share/gnome/help/control-center/C/peripherals.html
+share/gnome/help/control-center/C/session.html
+share/gnome/help/control-center/C/stylesheet-images/caution.gif
+share/gnome/help/control-center/C/stylesheet-images/home.gif
+share/gnome/help/control-center/C/stylesheet-images/important.gif
+share/gnome/help/control-center/C/stylesheet-images/next.gif
+share/gnome/help/control-center/C/stylesheet-images/note.gif
+share/gnome/help/control-center/C/stylesheet-images/prev.gif
+share/gnome/help/control-center/C/stylesheet-images/tip.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
+share/gnome/help/control-center/C/stylesheet-images/up.gif
+share/gnome/help/control-center/C/stylesheet-images/warning.gif
 share/gnome/help/control-center/C/topic.dat
+share/gnome/help/control-center/C/usage.html
 share/gnome/idl/control-center.idl
+share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -222,6 +256,8 @@ share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/az/LC_MESSAGES/control-center.mo
+share/locale/bg/LC_MESSAGES/control-center.mo
 share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
@@ -230,6 +266,7 @@ share/locale/el/LC_MESSAGES/control-center.mo
 share/locale/en_GB/LC_MESSAGES/control-center.mo
 share/locale/es/LC_MESSAGES/control-center.mo
 share/locale/et/LC_MESSAGES/control-center.mo
+share/locale/eu/LC_MESSAGES/control-center.mo
 share/locale/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
@@ -247,15 +284,18 @@ share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/pt_BR/LC_MESSAGES/control-center.mo
 share/locale/ro/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
+share/locale/sk/LC_MESSAGES/control-center.mo
 share/locale/sl/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
 share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
+share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
+@dirrm share/gnome/omf/control-center
 @dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C/figures
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/control-center/UIOptions
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index a6e1f48cdbbf..d78a3a906df2 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -15,7 +14,8 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnome-control-center1/distinfo b/sysutils/gnome-control-center1/distinfo
index 9de7feb0edf2..2d889c5c8570 100644
--- a/sysutils/gnome-control-center1/distinfo
+++ b/sysutils/gnome-control-center1/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.2.2.tar.gz) = 13687951e810f536b87c3cf29cc61c07
+MD5 (control-center-1.4.0.1.tar.gz) = 53e3d628a0d53a4b74e1ae8d8cb057ff
diff --git a/sysutils/gnome-control-center1/files/patch-bn b/sysutils/gnome-control-center1/files/patch-bn
index 96c34a77aa91..294e18fe95ed 100644
--- a/sysutils/gnome-control-center1/files/patch-bn
+++ b/sysutils/gnome-control-center1/files/patch-bn
@@ -8,7 +8,7 @@
 @@ -168,3 +168,3 @@
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 4:0:0
++libcapplet_la_LDFLAGS = -version-info 5:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
 @@ -590,2 +590,3 @@
  	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index 66866c527d9c..a2007948fbb8 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -1,11 +1,10 @@
 bin/background-properties-capplet
+bin/file-types-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
-bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
-bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -16,7 +15,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.4
+lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
@@ -24,7 +23,6 @@ share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
 share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-share/gnome/apps/Settings/Documents/mime-type.desktop
 share/gnome/apps/Settings/Documents/url-properties.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
@@ -32,11 +30,8 @@ share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/Session/session-properties.desktop
 share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/UIOptions/application.desktop
-share/gnome/apps/Settings/UIOptions/dialogs.desktop
-share/gnome/apps/Settings/UIOptions/mdi.desktop
+share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
@@ -51,10 +46,15 @@ share/gnome/control-center/.data/Bubble3d.desktop
 share/gnome/control-center/.data/Bubbles.desktop
 share/gnome/control-center/.data/Bumps.desktop
 share/gnome/control-center/.data/Cage.desktop
+share/gnome/control-center/.data/Compass.desktop
 share/gnome/control-center/.data/Coral.desktop
+share/gnome/control-center/.data/Critical.desktop
+share/gnome/control-center/.data/Crystal.desktop
+share/gnome/control-center/.data/crystal.png
 share/gnome/control-center/.data/Cynosure.desktop
 share/gnome/control-center/.data/Decayscreen.desktop
 share/gnome/control-center/.data/Deco.desktop
+share/gnome/control-center/.data/Deluxe.desktop
 share/gnome/control-center/.data/Demon.desktop
 share/gnome/control-center/.data/Discrete.desktop
 share/gnome/control-center/.data/Distort.desktop
@@ -98,6 +98,7 @@ share/gnome/control-center/.data/Mountain.desktop
 share/gnome/control-center/.data/Munch.desktop
 share/gnome/control-center/.data/Noseguy.desktop
 share/gnome/control-center/.data/Pedal.desktop
+share/gnome/control-center/.data/Penetrate.desktop
 share/gnome/control-center/.data/Penrose.desktop
 share/gnome/control-center/.data/Phosphor.desktop
 share/gnome/control-center/.data/Pipes.desktop
@@ -116,7 +117,9 @@ share/gnome/control-center/.data/Slip.desktop
 share/gnome/control-center/.data/Sonar.desktop
 share/gnome/control-center/.data/Sphere.desktop
 share/gnome/control-center/.data/Spiral.desktop
+share/gnome/control-center/.data/Spotlight.desktop
 share/gnome/control-center/.data/Sproingies.desktop
+share/gnome/control-center/.data/Squiral.desktop
 share/gnome/control-center/.data/Stairs.desktop
 share/gnome/control-center/.data/Starfish.desktop
 share/gnome/control-center/.data/Strange.desktop
@@ -126,6 +129,7 @@ share/gnome/control-center/.data/Triangle.desktop
 share/gnome/control-center/.data/Truchet.desktop
 share/gnome/control-center/.data/Vines.desktop
 share/gnome/control-center/.data/Worm.desktop
+share/gnome/control-center/.data/Xflame.desktop
 share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xmatrix.desktop
@@ -181,8 +185,8 @@ share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
+share/gnome/control-center/Documents/file-types-capplet.desktop
 share/gnome/control-center/Documents/gnome-edit-properties.desktop
-share/gnome/control-center/Documents/mime-type.desktop
 share/gnome/control-center/Documents/url-properties.desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/sound-properties.desktop
@@ -190,31 +194,61 @@ share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
 share/gnome/control-center/Session/.directory
-share/gnome/control-center/Session/session-properties.desktop
 share/gnome/control-center/UIOptions/.directory
 share/gnome/control-center/UIOptions/application.desktop
 share/gnome/control-center/UIOptions/dialogs.desktop
 share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/figs/bg-capplet.png
-share/gnome/help/control-center/C/figs/gccappdef.png
-share/gnome/help/control-center/C/figs/gccdialog.png
-share/gnome/help/control-center/C/figs/gccedit.png
-share/gnome/help/control-center/C/figs/gcchints.png
-share/gnome/help/control-center/C/figs/gccmdi.png
-share/gnome/help/control-center/C/figs/gccmime.png
-share/gnome/help/control-center/C/figs/gccsession-props.png
-share/gnome/help/control-center/C/figs/gccsound1.png
-share/gnome/help/control-center/C/figs/gccsound2.png
-share/gnome/help/control-center/C/figs/gccstartup.png
-share/gnome/help/control-center/C/figs/gccurl.png
-share/gnome/help/control-center/C/figs/glob_pref_anim.png
-share/gnome/help/control-center/C/figs/keyboard-capplet.png
-share/gnome/help/control-center/C/figs/mouse-capplet.png
-share/gnome/help/control-center/C/figs/screensave-capplet.png
-share/gnome/help/control-center/C/figs/theme-select.png
-share/gnome/help/control-center/C/figs/wm-main.png
+share/gnome/help/control-center/C/alf.html
+share/gnome/help/control-center/C/authors.html
+share/gnome/help/control-center/C/desktop-intro.html
+share/gnome/help/control-center/C/control-center.sgml
+share/gnome/help/control-center/C/doc-handlers.html
+share/gnome/help/control-center/C/docbook.css
+share/gnome/help/control-center/C/figures/bg-capplet.png
+share/gnome/help/control-center/C/figures/gccalf.png
+share/gnome/help/control-center/C/figures/gccappdef.png
+share/gnome/help/control-center/C/figures/gccdialog.png
+share/gnome/help/control-center/C/figures/gccedit.png
+share/gnome/help/control-center/C/figures/gcchints.png
+share/gnome/help/control-center/C/figures/gccmdi.png
+share/gnome/help/control-center/C/figures/gccmime.png
+share/gnome/help/control-center/C/figures/gccsession-props.png
+share/gnome/help/control-center/C/figures/gccsessopt.png
+share/gnome/help/control-center/C/figures/gccsound1.png
+share/gnome/help/control-center/C/figures/gccsound2.png
+share/gnome/help/control-center/C/figures/gccstartup.png
+share/gnome/help/control-center/C/figures/gccurl.png
+share/gnome/help/control-center/C/figures/glob_pref_anim.png
+share/gnome/help/control-center/C/figures/keyboard-capplet.png
+share/gnome/help/control-center/C/figures/mouse-capplet.png
+share/gnome/help/control-center/C/figures/screensave-capplet.png
+share/gnome/help/control-center/C/figures/theme-select.png
+share/gnome/help/control-center/C/figures/wm-add.png
+share/gnome/help/control-center/C/figures/wm-main.png
+share/gnome/help/control-center/C/filetypes.html
+share/gnome/help/control-center/C/gccui.html
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/license.html
+share/gnome/help/control-center/C/ln7.html
+share/gnome/help/control-center/C/multimedia-intro.html
+share/gnome/help/control-center/C/peripherals.html
+share/gnome/help/control-center/C/session.html
+share/gnome/help/control-center/C/stylesheet-images/caution.gif
+share/gnome/help/control-center/C/stylesheet-images/home.gif
+share/gnome/help/control-center/C/stylesheet-images/important.gif
+share/gnome/help/control-center/C/stylesheet-images/next.gif
+share/gnome/help/control-center/C/stylesheet-images/note.gif
+share/gnome/help/control-center/C/stylesheet-images/prev.gif
+share/gnome/help/control-center/C/stylesheet-images/tip.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
+share/gnome/help/control-center/C/stylesheet-images/up.gif
+share/gnome/help/control-center/C/stylesheet-images/warning.gif
 share/gnome/help/control-center/C/topic.dat
+share/gnome/help/control-center/C/usage.html
 share/gnome/idl/control-center.idl
+share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -222,6 +256,8 @@ share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/az/LC_MESSAGES/control-center.mo
+share/locale/bg/LC_MESSAGES/control-center.mo
 share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
@@ -230,6 +266,7 @@ share/locale/el/LC_MESSAGES/control-center.mo
 share/locale/en_GB/LC_MESSAGES/control-center.mo
 share/locale/es/LC_MESSAGES/control-center.mo
 share/locale/et/LC_MESSAGES/control-center.mo
+share/locale/eu/LC_MESSAGES/control-center.mo
 share/locale/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
@@ -247,15 +284,18 @@ share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/pt_BR/LC_MESSAGES/control-center.mo
 share/locale/ro/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
+share/locale/sk/LC_MESSAGES/control-center.mo
 share/locale/sl/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
 share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
+share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
+@dirrm share/gnome/omf/control-center
 @dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C/figures
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/control-center/UIOptions
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 4dbf9a588bf3..6e60d5a38cf5 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION=	1.0.12
+PORTVERSION=	1.0.13
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtop
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index ad173bb96ded..0124fc30435a 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1 +1 @@
-MD5 (gtop-1.0.12.tar.gz) = 92c6afba8ebabc59bdefbea6bed50efe
+MD5 (gtop-1.0.13.tar.gz) = 4580801db3c87784b25f46a5bf1f5aba
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 5c9e2db1c378..af3cbf5b6ee5 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -31,6 +31,7 @@ share/locale/no/LC_MESSAGES/gtop.mo
 share/locale/pl/LC_MESSAGES/gtop.mo
 share/locale/pt/LC_MESSAGES/gtop.mo
 share/locale/pt_BR/LC_MESSAGES/gtop.mo
+share/locale/ro/LC_MESSAGES/gtop.mo
 share/locale/ru/LC_MESSAGES/gtop.mo
 share/locale/sk/LC_MESSAGES/gtop.mo
 share/locale/sl/LC_MESSAGES/gtop.mo
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index a6e1f48cdbbf..d78a3a906df2 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -15,7 +14,8 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo
index 9de7feb0edf2..2d889c5c8570 100644
--- a/sysutils/gnomecontrolcenter/distinfo
+++ b/sysutils/gnomecontrolcenter/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.2.2.tar.gz) = 13687951e810f536b87c3cf29cc61c07
+MD5 (control-center-1.4.0.1.tar.gz) = 53e3d628a0d53a4b74e1ae8d8cb057ff
diff --git a/sysutils/gnomecontrolcenter/files/patch-bn b/sysutils/gnomecontrolcenter/files/patch-bn
index 96c34a77aa91..294e18fe95ed 100644
--- a/sysutils/gnomecontrolcenter/files/patch-bn
+++ b/sysutils/gnomecontrolcenter/files/patch-bn
@@ -8,7 +8,7 @@
 @@ -168,3 +168,3 @@
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 4:0:0
++libcapplet_la_LDFLAGS = -version-info 5:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
 @@ -590,2 +590,3 @@
  	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
index 66866c527d9c..a2007948fbb8 100644
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ b/sysutils/gnomecontrolcenter/pkg-plist
@@ -1,11 +1,10 @@
 bin/background-properties-capplet
+bin/file-types-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
-bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
-bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -16,7 +15,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.4
+lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
@@ -24,7 +23,6 @@ share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
 share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-share/gnome/apps/Settings/Documents/mime-type.desktop
 share/gnome/apps/Settings/Documents/url-properties.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
@@ -32,11 +30,8 @@ share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/Session/session-properties.desktop
 share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/UIOptions/application.desktop
-share/gnome/apps/Settings/UIOptions/dialogs.desktop
-share/gnome/apps/Settings/UIOptions/mdi.desktop
+share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
@@ -51,10 +46,15 @@ share/gnome/control-center/.data/Bubble3d.desktop
 share/gnome/control-center/.data/Bubbles.desktop
 share/gnome/control-center/.data/Bumps.desktop
 share/gnome/control-center/.data/Cage.desktop
+share/gnome/control-center/.data/Compass.desktop
 share/gnome/control-center/.data/Coral.desktop
+share/gnome/control-center/.data/Critical.desktop
+share/gnome/control-center/.data/Crystal.desktop
+share/gnome/control-center/.data/crystal.png
 share/gnome/control-center/.data/Cynosure.desktop
 share/gnome/control-center/.data/Decayscreen.desktop
 share/gnome/control-center/.data/Deco.desktop
+share/gnome/control-center/.data/Deluxe.desktop
 share/gnome/control-center/.data/Demon.desktop
 share/gnome/control-center/.data/Discrete.desktop
 share/gnome/control-center/.data/Distort.desktop
@@ -98,6 +98,7 @@ share/gnome/control-center/.data/Mountain.desktop
 share/gnome/control-center/.data/Munch.desktop
 share/gnome/control-center/.data/Noseguy.desktop
 share/gnome/control-center/.data/Pedal.desktop
+share/gnome/control-center/.data/Penetrate.desktop
 share/gnome/control-center/.data/Penrose.desktop
 share/gnome/control-center/.data/Phosphor.desktop
 share/gnome/control-center/.data/Pipes.desktop
@@ -116,7 +117,9 @@ share/gnome/control-center/.data/Slip.desktop
 share/gnome/control-center/.data/Sonar.desktop
 share/gnome/control-center/.data/Sphere.desktop
 share/gnome/control-center/.data/Spiral.desktop
+share/gnome/control-center/.data/Spotlight.desktop
 share/gnome/control-center/.data/Sproingies.desktop
+share/gnome/control-center/.data/Squiral.desktop
 share/gnome/control-center/.data/Stairs.desktop
 share/gnome/control-center/.data/Starfish.desktop
 share/gnome/control-center/.data/Strange.desktop
@@ -126,6 +129,7 @@ share/gnome/control-center/.data/Triangle.desktop
 share/gnome/control-center/.data/Truchet.desktop
 share/gnome/control-center/.data/Vines.desktop
 share/gnome/control-center/.data/Worm.desktop
+share/gnome/control-center/.data/Xflame.desktop
 share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xmatrix.desktop
@@ -181,8 +185,8 @@ share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
+share/gnome/control-center/Documents/file-types-capplet.desktop
 share/gnome/control-center/Documents/gnome-edit-properties.desktop
-share/gnome/control-center/Documents/mime-type.desktop
 share/gnome/control-center/Documents/url-properties.desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/sound-properties.desktop
@@ -190,31 +194,61 @@ share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
 share/gnome/control-center/Session/.directory
-share/gnome/control-center/Session/session-properties.desktop
 share/gnome/control-center/UIOptions/.directory
 share/gnome/control-center/UIOptions/application.desktop
 share/gnome/control-center/UIOptions/dialogs.desktop
 share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/figs/bg-capplet.png
-share/gnome/help/control-center/C/figs/gccappdef.png
-share/gnome/help/control-center/C/figs/gccdialog.png
-share/gnome/help/control-center/C/figs/gccedit.png
-share/gnome/help/control-center/C/figs/gcchints.png
-share/gnome/help/control-center/C/figs/gccmdi.png
-share/gnome/help/control-center/C/figs/gccmime.png
-share/gnome/help/control-center/C/figs/gccsession-props.png
-share/gnome/help/control-center/C/figs/gccsound1.png
-share/gnome/help/control-center/C/figs/gccsound2.png
-share/gnome/help/control-center/C/figs/gccstartup.png
-share/gnome/help/control-center/C/figs/gccurl.png
-share/gnome/help/control-center/C/figs/glob_pref_anim.png
-share/gnome/help/control-center/C/figs/keyboard-capplet.png
-share/gnome/help/control-center/C/figs/mouse-capplet.png
-share/gnome/help/control-center/C/figs/screensave-capplet.png
-share/gnome/help/control-center/C/figs/theme-select.png
-share/gnome/help/control-center/C/figs/wm-main.png
+share/gnome/help/control-center/C/alf.html
+share/gnome/help/control-center/C/authors.html
+share/gnome/help/control-center/C/desktop-intro.html
+share/gnome/help/control-center/C/control-center.sgml
+share/gnome/help/control-center/C/doc-handlers.html
+share/gnome/help/control-center/C/docbook.css
+share/gnome/help/control-center/C/figures/bg-capplet.png
+share/gnome/help/control-center/C/figures/gccalf.png
+share/gnome/help/control-center/C/figures/gccappdef.png
+share/gnome/help/control-center/C/figures/gccdialog.png
+share/gnome/help/control-center/C/figures/gccedit.png
+share/gnome/help/control-center/C/figures/gcchints.png
+share/gnome/help/control-center/C/figures/gccmdi.png
+share/gnome/help/control-center/C/figures/gccmime.png
+share/gnome/help/control-center/C/figures/gccsession-props.png
+share/gnome/help/control-center/C/figures/gccsessopt.png
+share/gnome/help/control-center/C/figures/gccsound1.png
+share/gnome/help/control-center/C/figures/gccsound2.png
+share/gnome/help/control-center/C/figures/gccstartup.png
+share/gnome/help/control-center/C/figures/gccurl.png
+share/gnome/help/control-center/C/figures/glob_pref_anim.png
+share/gnome/help/control-center/C/figures/keyboard-capplet.png
+share/gnome/help/control-center/C/figures/mouse-capplet.png
+share/gnome/help/control-center/C/figures/screensave-capplet.png
+share/gnome/help/control-center/C/figures/theme-select.png
+share/gnome/help/control-center/C/figures/wm-add.png
+share/gnome/help/control-center/C/figures/wm-main.png
+share/gnome/help/control-center/C/filetypes.html
+share/gnome/help/control-center/C/gccui.html
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/license.html
+share/gnome/help/control-center/C/ln7.html
+share/gnome/help/control-center/C/multimedia-intro.html
+share/gnome/help/control-center/C/peripherals.html
+share/gnome/help/control-center/C/session.html
+share/gnome/help/control-center/C/stylesheet-images/caution.gif
+share/gnome/help/control-center/C/stylesheet-images/home.gif
+share/gnome/help/control-center/C/stylesheet-images/important.gif
+share/gnome/help/control-center/C/stylesheet-images/next.gif
+share/gnome/help/control-center/C/stylesheet-images/note.gif
+share/gnome/help/control-center/C/stylesheet-images/prev.gif
+share/gnome/help/control-center/C/stylesheet-images/tip.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
+share/gnome/help/control-center/C/stylesheet-images/up.gif
+share/gnome/help/control-center/C/stylesheet-images/warning.gif
 share/gnome/help/control-center/C/topic.dat
+share/gnome/help/control-center/C/usage.html
 share/gnome/idl/control-center.idl
+share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -222,6 +256,8 @@ share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/az/LC_MESSAGES/control-center.mo
+share/locale/bg/LC_MESSAGES/control-center.mo
 share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
@@ -230,6 +266,7 @@ share/locale/el/LC_MESSAGES/control-center.mo
 share/locale/en_GB/LC_MESSAGES/control-center.mo
 share/locale/es/LC_MESSAGES/control-center.mo
 share/locale/et/LC_MESSAGES/control-center.mo
+share/locale/eu/LC_MESSAGES/control-center.mo
 share/locale/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
@@ -247,15 +284,18 @@ share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/pt_BR/LC_MESSAGES/control-center.mo
 share/locale/ro/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
+share/locale/sk/LC_MESSAGES/control-center.mo
 share/locale/sl/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
 share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
+share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
+@dirrm share/gnome/omf/control-center
 @dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C/figures
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/control-center/UIOptions
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index a6e1f48cdbbf..d78a3a906df2 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -15,7 +14,8 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 9de7feb0edf2..2d889c5c8570 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.2.2.tar.gz) = 13687951e810f536b87c3cf29cc61c07
+MD5 (control-center-1.4.0.1.tar.gz) = 53e3d628a0d53a4b74e1ae8d8cb057ff
diff --git a/sysutils/gnomecontrolcenter2/files/patch-bn b/sysutils/gnomecontrolcenter2/files/patch-bn
index 96c34a77aa91..294e18fe95ed 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-bn
+++ b/sysutils/gnomecontrolcenter2/files/patch-bn
@@ -8,7 +8,7 @@
 @@ -168,3 +168,3 @@
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 4:0:0
++libcapplet_la_LDFLAGS = -version-info 5:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
 @@ -590,2 +590,3 @@
  	    -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 66866c527d9c..a2007948fbb8 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -1,11 +1,10 @@
 bin/background-properties-capplet
+bin/file-types-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
-bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
-bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
@@ -16,7 +15,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.4
+lib/libcapplet.so.5
 share/gnome/apps/Settings/Desktop/.directory
 share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
@@ -24,7 +23,6 @@ share/gnome/apps/Settings/Desktop/theme-selector.desktop
 share/gnome/apps/Settings/Desktop/wm-properties.desktop
 share/gnome/apps/Settings/Documents/.directory
 share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-share/gnome/apps/Settings/Documents/mime-type.desktop
 share/gnome/apps/Settings/Documents/url-properties.desktop
 share/gnome/apps/Settings/Multimedia/.directory
 share/gnome/apps/Settings/Multimedia/sound-properties.desktop
@@ -32,11 +30,8 @@ share/gnome/apps/Settings/Peripherals/.directory
 share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
 share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
 share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/Session/session-properties.desktop
 share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/UIOptions/application.desktop
-share/gnome/apps/Settings/UIOptions/dialogs.desktop
-share/gnome/apps/Settings/UIOptions/mdi.desktop
+share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
@@ -51,10 +46,15 @@ share/gnome/control-center/.data/Bubble3d.desktop
 share/gnome/control-center/.data/Bubbles.desktop
 share/gnome/control-center/.data/Bumps.desktop
 share/gnome/control-center/.data/Cage.desktop
+share/gnome/control-center/.data/Compass.desktop
 share/gnome/control-center/.data/Coral.desktop
+share/gnome/control-center/.data/Critical.desktop
+share/gnome/control-center/.data/Crystal.desktop
+share/gnome/control-center/.data/crystal.png
 share/gnome/control-center/.data/Cynosure.desktop
 share/gnome/control-center/.data/Decayscreen.desktop
 share/gnome/control-center/.data/Deco.desktop
+share/gnome/control-center/.data/Deluxe.desktop
 share/gnome/control-center/.data/Demon.desktop
 share/gnome/control-center/.data/Discrete.desktop
 share/gnome/control-center/.data/Distort.desktop
@@ -98,6 +98,7 @@ share/gnome/control-center/.data/Mountain.desktop
 share/gnome/control-center/.data/Munch.desktop
 share/gnome/control-center/.data/Noseguy.desktop
 share/gnome/control-center/.data/Pedal.desktop
+share/gnome/control-center/.data/Penetrate.desktop
 share/gnome/control-center/.data/Penrose.desktop
 share/gnome/control-center/.data/Phosphor.desktop
 share/gnome/control-center/.data/Pipes.desktop
@@ -116,7 +117,9 @@ share/gnome/control-center/.data/Slip.desktop
 share/gnome/control-center/.data/Sonar.desktop
 share/gnome/control-center/.data/Sphere.desktop
 share/gnome/control-center/.data/Spiral.desktop
+share/gnome/control-center/.data/Spotlight.desktop
 share/gnome/control-center/.data/Sproingies.desktop
+share/gnome/control-center/.data/Squiral.desktop
 share/gnome/control-center/.data/Stairs.desktop
 share/gnome/control-center/.data/Starfish.desktop
 share/gnome/control-center/.data/Strange.desktop
@@ -126,6 +129,7 @@ share/gnome/control-center/.data/Triangle.desktop
 share/gnome/control-center/.data/Truchet.desktop
 share/gnome/control-center/.data/Vines.desktop
 share/gnome/control-center/.data/Worm.desktop
+share/gnome/control-center/.data/Xflame.desktop
 share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xmatrix.desktop
@@ -181,8 +185,8 @@ share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/theme-selector.desktop
 share/gnome/control-center/Desktop/wm-properties.desktop
 share/gnome/control-center/Documents/.directory
+share/gnome/control-center/Documents/file-types-capplet.desktop
 share/gnome/control-center/Documents/gnome-edit-properties.desktop
-share/gnome/control-center/Documents/mime-type.desktop
 share/gnome/control-center/Documents/url-properties.desktop
 share/gnome/control-center/Multimedia/.directory
 share/gnome/control-center/Multimedia/sound-properties.desktop
@@ -190,31 +194,61 @@ share/gnome/control-center/Peripherals/.directory
 share/gnome/control-center/Peripherals/keyboard-properties.desktop
 share/gnome/control-center/Peripherals/mouse-properties.desktop
 share/gnome/control-center/Session/.directory
-share/gnome/control-center/Session/session-properties.desktop
 share/gnome/control-center/UIOptions/.directory
 share/gnome/control-center/UIOptions/application.desktop
 share/gnome/control-center/UIOptions/dialogs.desktop
 share/gnome/control-center/UIOptions/mdi.desktop
-share/gnome/help/control-center/C/figs/bg-capplet.png
-share/gnome/help/control-center/C/figs/gccappdef.png
-share/gnome/help/control-center/C/figs/gccdialog.png
-share/gnome/help/control-center/C/figs/gccedit.png
-share/gnome/help/control-center/C/figs/gcchints.png
-share/gnome/help/control-center/C/figs/gccmdi.png
-share/gnome/help/control-center/C/figs/gccmime.png
-share/gnome/help/control-center/C/figs/gccsession-props.png
-share/gnome/help/control-center/C/figs/gccsound1.png
-share/gnome/help/control-center/C/figs/gccsound2.png
-share/gnome/help/control-center/C/figs/gccstartup.png
-share/gnome/help/control-center/C/figs/gccurl.png
-share/gnome/help/control-center/C/figs/glob_pref_anim.png
-share/gnome/help/control-center/C/figs/keyboard-capplet.png
-share/gnome/help/control-center/C/figs/mouse-capplet.png
-share/gnome/help/control-center/C/figs/screensave-capplet.png
-share/gnome/help/control-center/C/figs/theme-select.png
-share/gnome/help/control-center/C/figs/wm-main.png
+share/gnome/help/control-center/C/alf.html
+share/gnome/help/control-center/C/authors.html
+share/gnome/help/control-center/C/desktop-intro.html
+share/gnome/help/control-center/C/control-center.sgml
+share/gnome/help/control-center/C/doc-handlers.html
+share/gnome/help/control-center/C/docbook.css
+share/gnome/help/control-center/C/figures/bg-capplet.png
+share/gnome/help/control-center/C/figures/gccalf.png
+share/gnome/help/control-center/C/figures/gccappdef.png
+share/gnome/help/control-center/C/figures/gccdialog.png
+share/gnome/help/control-center/C/figures/gccedit.png
+share/gnome/help/control-center/C/figures/gcchints.png
+share/gnome/help/control-center/C/figures/gccmdi.png
+share/gnome/help/control-center/C/figures/gccmime.png
+share/gnome/help/control-center/C/figures/gccsession-props.png
+share/gnome/help/control-center/C/figures/gccsessopt.png
+share/gnome/help/control-center/C/figures/gccsound1.png
+share/gnome/help/control-center/C/figures/gccsound2.png
+share/gnome/help/control-center/C/figures/gccstartup.png
+share/gnome/help/control-center/C/figures/gccurl.png
+share/gnome/help/control-center/C/figures/glob_pref_anim.png
+share/gnome/help/control-center/C/figures/keyboard-capplet.png
+share/gnome/help/control-center/C/figures/mouse-capplet.png
+share/gnome/help/control-center/C/figures/screensave-capplet.png
+share/gnome/help/control-center/C/figures/theme-select.png
+share/gnome/help/control-center/C/figures/wm-add.png
+share/gnome/help/control-center/C/figures/wm-main.png
+share/gnome/help/control-center/C/filetypes.html
+share/gnome/help/control-center/C/gccui.html
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/license.html
+share/gnome/help/control-center/C/ln7.html
+share/gnome/help/control-center/C/multimedia-intro.html
+share/gnome/help/control-center/C/peripherals.html
+share/gnome/help/control-center/C/session.html
+share/gnome/help/control-center/C/stylesheet-images/caution.gif
+share/gnome/help/control-center/C/stylesheet-images/home.gif
+share/gnome/help/control-center/C/stylesheet-images/important.gif
+share/gnome/help/control-center/C/stylesheet-images/next.gif
+share/gnome/help/control-center/C/stylesheet-images/note.gif
+share/gnome/help/control-center/C/stylesheet-images/prev.gif
+share/gnome/help/control-center/C/stylesheet-images/tip.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-blank.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-minus.gif
+share/gnome/help/control-center/C/stylesheet-images/toc-plus.gif
+share/gnome/help/control-center/C/stylesheet-images/up.gif
+share/gnome/help/control-center/C/stylesheet-images/warning.gif
 share/gnome/help/control-center/C/topic.dat
+share/gnome/help/control-center/C/usage.html
 share/gnome/idl/control-center.idl
+share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
@@ -222,6 +256,8 @@ share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/az/LC_MESSAGES/control-center.mo
+share/locale/bg/LC_MESSAGES/control-center.mo
 share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
@@ -230,6 +266,7 @@ share/locale/el/LC_MESSAGES/control-center.mo
 share/locale/en_GB/LC_MESSAGES/control-center.mo
 share/locale/es/LC_MESSAGES/control-center.mo
 share/locale/et/LC_MESSAGES/control-center.mo
+share/locale/eu/LC_MESSAGES/control-center.mo
 share/locale/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
@@ -247,15 +284,18 @@ share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/pt_BR/LC_MESSAGES/control-center.mo
 share/locale/ro/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
+share/locale/sk/LC_MESSAGES/control-center.mo
 share/locale/sl/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
 share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
+share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
+@dirrm share/gnome/omf/control-center
 @dirrm share/gnome/help/control-center/C/stylesheet-images
-@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C/figures
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/control-center/UIOptions
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 4dbf9a588bf3..6e60d5a38cf5 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION=	1.0.12
+PORTVERSION=	1.0.13
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtop
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index ad173bb96ded..0124fc30435a 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gtop-1.0.12.tar.gz) = 92c6afba8ebabc59bdefbea6bed50efe
+MD5 (gtop-1.0.13.tar.gz) = 4580801db3c87784b25f46a5bf1f5aba
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 5c9e2db1c378..af3cbf5b6ee5 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -31,6 +31,7 @@ share/locale/no/LC_MESSAGES/gtop.mo
 share/locale/pl/LC_MESSAGES/gtop.mo
 share/locale/pt/LC_MESSAGES/gtop.mo
 share/locale/pt_BR/LC_MESSAGES/gtop.mo
+share/locale/ro/LC_MESSAGES/gtop.mo
 share/locale/ru/LC_MESSAGES/gtop.mo
 share/locale/sk/LC_MESSAGES/gtop.mo
 share/locale/sl/LC_MESSAGES/gtop.mo
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 4dbf9a588bf3..6e60d5a38cf5 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION=	1.0.12
+PORTVERSION=	1.0.13
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtop
diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo
index ad173bb96ded..0124fc30435a 100644
--- a/sysutils/gtop/distinfo
+++ b/sysutils/gtop/distinfo
@@ -1 +1 @@
-MD5 (gtop-1.0.12.tar.gz) = 92c6afba8ebabc59bdefbea6bed50efe
+MD5 (gtop-1.0.13.tar.gz) = 4580801db3c87784b25f46a5bf1f5aba
diff --git a/sysutils/gtop/pkg-plist b/sysutils/gtop/pkg-plist
index 5c9e2db1c378..af3cbf5b6ee5 100644
--- a/sysutils/gtop/pkg-plist
+++ b/sysutils/gtop/pkg-plist
@@ -31,6 +31,7 @@ share/locale/no/LC_MESSAGES/gtop.mo
 share/locale/pl/LC_MESSAGES/gtop.mo
 share/locale/pt/LC_MESSAGES/gtop.mo
 share/locale/pt_BR/LC_MESSAGES/gtop.mo
+share/locale/ro/LC_MESSAGES/gtop.mo
 share/locale/ru/LC_MESSAGES/gtop.mo
 share/locale/sk/LC_MESSAGES/gtop.mo
 share/locale/sl/LC_MESSAGES/gtop.mo