Say hello to GNOME 1.2

	audio/gnomemedia		1.2.0
	deskutils/gnomepim		1.2.0
	devel/bugbuddy			1.0
	devel/glade			0.5.9
	devel/libgtop			1.0.9
	games/gnomegames		1.2.0
	graphics/imlib			1.9.8.1
	misc/gnomeusersguide		1.2
	misc/gnomeutils			1.2.0
	sysutils/gnomecontrolcenter	1.2.0
	sysutils/gtop			1.0.8
	x11-fm/gmomemc			4.5.50
	x11/gnomecore			1.2.0
	x11/gnomelibs			1.2.1

Along with cosmetic changes to other parts of the metaport
for the new shared library version numbers.

Plus.  The metaport has been reworked to bring in a few more
often-requested items.

Please note that you absolutely need GTK/GLIB 1.2.8 or higher
for this release.

25 files changed, 267 insertions, 93 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 59d72d7693e..14988514158 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.0.53
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -14,8 +14,7 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 0524ffcbb85..986850c6ce1 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8
+MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e
diff --git a/sysutils/gnome-control-center/files/patch-bn b/sysutils/gnome-control-center/files/patch-bn
index e7543a038ea..da5233b1627 100644
--- a/sysutils/gnome-control-center/files/patch-bn
+++ b/sysutils/gnome-control-center/files/patch-bn
@@ -25,7 +25,7 @@
  
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 1:0:0
++libcapplet_la_LDFLAGS = -version-info 4:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
  
  include_HEADERS = capplet-widget.h
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index ff9d67b2885..984a3c4e056 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -16,7 +16,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.1
+lib/libcapplet.so.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/apps/Settings/Desktop/.directory
@@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 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
 share/gnome/apps/Settings/Peripherals/.directory
@@ -35,10 +39,7 @@ 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/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/apps/Settings/mime-type.desktop
-share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
 share/gnome/control-center/.data/Ant.desktop
@@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop
 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/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
 share/gnome/control-center/Peripherals/.directory
@@ -185,29 +190,52 @@ 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/control-center/gnome-edit-properties.desktop
-share/gnome/control-center/mime-type.desktop
-share/gnome/control-center/url-properties.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/index.html
+share/gnome/help/control-center/C/topic.dat
 share/gnome/idl/control-center.idl
+share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
+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/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
+share/locale/gl/LC_MESSAGES/control-center.mo
+share/locale/hr/LC_MESSAGES/control-center.mo
 share/locale/hu/LC_MESSAGES/control-center.mo
 share/locale/it/LC_MESSAGES/control-center.mo
 share/locale/ja/LC_MESSAGES/control-center.mo
 share/locale/ko/LC_MESSAGES/control-center.mo
+share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
@@ -216,11 +244,21 @@ 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/sv/LC_MESSAGES/control-center.mo
+share/locale/tr/LC_MESSAGES/control-center.mo
+share/locale/uk/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/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/help
 @dirrm share/gnome/control-center/UIOptions
 @dirrm share/gnome/control-center/Session
 @dirrm share/gnome/control-center/Peripherals
 @dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
 @dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
@@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/apps/Settings/Session
 @dirrm share/gnome/apps/Settings/Peripherals
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Documents
 @dirrm share/gnome/apps/Settings/Desktop
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 59d72d7693e..14988514158 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.0.53
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -14,8 +14,7 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/sysutils/gnome-control-center1/distinfo b/sysutils/gnome-control-center1/distinfo
index 0524ffcbb85..986850c6ce1 100644
--- a/sysutils/gnome-control-center1/distinfo
+++ b/sysutils/gnome-control-center1/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8
+MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e
diff --git a/sysutils/gnome-control-center1/files/patch-bn b/sysutils/gnome-control-center1/files/patch-bn
index e7543a038ea..da5233b1627 100644
--- a/sysutils/gnome-control-center1/files/patch-bn
+++ b/sysutils/gnome-control-center1/files/patch-bn
@@ -25,7 +25,7 @@
  
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 1:0:0
++libcapplet_la_LDFLAGS = -version-info 4:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
  
  include_HEADERS = capplet-widget.h
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index ff9d67b2885..984a3c4e056 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -16,7 +16,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.1
+lib/libcapplet.so.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/apps/Settings/Desktop/.directory
@@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 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
 share/gnome/apps/Settings/Peripherals/.directory
@@ -35,10 +39,7 @@ 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/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/apps/Settings/mime-type.desktop
-share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
 share/gnome/control-center/.data/Ant.desktop
@@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop
 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/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
 share/gnome/control-center/Peripherals/.directory
@@ -185,29 +190,52 @@ 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/control-center/gnome-edit-properties.desktop
-share/gnome/control-center/mime-type.desktop
-share/gnome/control-center/url-properties.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/index.html
+share/gnome/help/control-center/C/topic.dat
 share/gnome/idl/control-center.idl
+share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
+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/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
+share/locale/gl/LC_MESSAGES/control-center.mo
+share/locale/hr/LC_MESSAGES/control-center.mo
 share/locale/hu/LC_MESSAGES/control-center.mo
 share/locale/it/LC_MESSAGES/control-center.mo
 share/locale/ja/LC_MESSAGES/control-center.mo
 share/locale/ko/LC_MESSAGES/control-center.mo
+share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
@@ -216,11 +244,21 @@ 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/sv/LC_MESSAGES/control-center.mo
+share/locale/tr/LC_MESSAGES/control-center.mo
+share/locale/uk/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/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/help
 @dirrm share/gnome/control-center/UIOptions
 @dirrm share/gnome/control-center/Session
 @dirrm share/gnome/control-center/Peripherals
 @dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
 @dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
@@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/apps/Settings/Session
 @dirrm share/gnome/apps/Settings/Peripherals
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Documents
 @dirrm share/gnome/apps/Settings/Desktop
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 98adf74d6ec..b288cc078ab 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 879de51197b..6cd6b1f5570 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1 +1 @@
-MD5 (gtop-1.0.7.tar.gz) = aa1f621dbe6461c5d6edd8d952c02d25
+MD5 (gtop-1.0.8.tar.gz) = f5749f352281c0e68d1d585207b9bec0
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index a1d92205fe0..80350981dcb 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,7 +1,8 @@
 bin/gtop
-share/gnome/apps/Utilities/gtop.desktop
+share/gnome/apps/System/gtop.desktop
 share/gnome/gtoprc
-share/gnome/help/gtop/C/c12.html
+share/gnome/help/gtop/C/credits.html
+share/gnome/help/gtop/C/errata.html
 share/gnome/help/gtop/C/figs/gtop-fs-1.png
 share/gnome/help/gtop/C/figs/gtop-fs-2.png
 share/gnome/help/gtop/C/figs/gtop-mem.png
@@ -11,25 +12,28 @@ share/gnome/help/gtop/C/figs/gtop-pic-middle.png
 share/gnome/help/gtop/C/figs/gtop-pic-top.png
 share/gnome/help/gtop/C/figs/gtop-prefs.png
 share/gnome/help/gtop/C/figs/gtop-proc.png
+share/gnome/help/gtop/C/filesystems.html
+share/gnome/help/gtop/C/gtop.html
 share/gnome/help/gtop/C/index.html
+share/gnome/help/gtop/C/memory.html
+share/gnome/help/gtop/C/more-info.html
+share/gnome/help/gtop/C/preferences.html
+share/gnome/help/gtop/C/processes.html
 share/gnome/help/gtop/C/topic.dat
-share/gnome/help/gtop/C/x365.html
-share/gnome/help/gtop/C/x436.html
-share/gnome/help/gtop/C/x45.html
-share/gnome/help/gtop/C/x511.html
-share/gnome/help/gtop/C/x619.html
-share/gnome/help/gtop/C/x627.html
-share/gnome/help/gtop/C/x656.html
 share/gnome/pixmaps/gnome-gtop.png
+share/locale/ca/LC_MESSAGES/gtop.mo
 share/locale/cs/LC_MESSAGES/gtop.mo
 share/locale/da/LC_MESSAGES/gtop.mo
 share/locale/de/LC_MESSAGES/gtop.mo
+share/locale/el/LC_MESSAGES/gtop.mo
 share/locale/es/LC_MESSAGES/gtop.mo
 share/locale/fr/LC_MESSAGES/gtop.mo
 share/locale/ga/LC_MESSAGES/gtop.mo
+share/locale/gl/LC_MESSAGES/gtop.mo
 share/locale/it/LC_MESSAGES/gtop.mo
 share/locale/ja/LC_MESSAGES/gtop.mo
 share/locale/ko/LC_MESSAGES/gtop.mo
+share/locale/lt/LC_MESSAGES/gtop.mo
 share/locale/no/LC_MESSAGES/gtop.mo
 share/locale/pl/LC_MESSAGES/gtop.mo
 share/locale/pt/LC_MESSAGES/gtop.mo
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 59d72d7693e..14988514158 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.0.53
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -14,8 +14,7 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo
index 0524ffcbb85..986850c6ce1 100644
--- a/sysutils/gnomecontrolcenter/distinfo
+++ b/sysutils/gnomecontrolcenter/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8
+MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e
diff --git a/sysutils/gnomecontrolcenter/files/patch-bn b/sysutils/gnomecontrolcenter/files/patch-bn
index e7543a038ea..da5233b1627 100644
--- a/sysutils/gnomecontrolcenter/files/patch-bn
+++ b/sysutils/gnomecontrolcenter/files/patch-bn
@@ -25,7 +25,7 @@
  
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 1:0:0
++libcapplet_la_LDFLAGS = -version-info 4:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
  
  include_HEADERS = capplet-widget.h
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
index ff9d67b2885..984a3c4e056 100644
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ b/sysutils/gnomecontrolcenter/pkg-plist
@@ -16,7 +16,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.1
+lib/libcapplet.so.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/apps/Settings/Desktop/.directory
@@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 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
 share/gnome/apps/Settings/Peripherals/.directory
@@ -35,10 +39,7 @@ 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/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/apps/Settings/mime-type.desktop
-share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
 share/gnome/control-center/.data/Ant.desktop
@@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop
 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/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
 share/gnome/control-center/Peripherals/.directory
@@ -185,29 +190,52 @@ 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/control-center/gnome-edit-properties.desktop
-share/gnome/control-center/mime-type.desktop
-share/gnome/control-center/url-properties.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/index.html
+share/gnome/help/control-center/C/topic.dat
 share/gnome/idl/control-center.idl
+share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
+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/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
+share/locale/gl/LC_MESSAGES/control-center.mo
+share/locale/hr/LC_MESSAGES/control-center.mo
 share/locale/hu/LC_MESSAGES/control-center.mo
 share/locale/it/LC_MESSAGES/control-center.mo
 share/locale/ja/LC_MESSAGES/control-center.mo
 share/locale/ko/LC_MESSAGES/control-center.mo
+share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
@@ -216,11 +244,21 @@ 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/sv/LC_MESSAGES/control-center.mo
+share/locale/tr/LC_MESSAGES/control-center.mo
+share/locale/uk/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/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/help
 @dirrm share/gnome/control-center/UIOptions
 @dirrm share/gnome/control-center/Session
 @dirrm share/gnome/control-center/Peripherals
 @dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
 @dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
@@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/apps/Settings/Session
 @dirrm share/gnome/apps/Settings/Peripherals
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Documents
 @dirrm share/gnome/apps/Settings/Desktop
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 59d72d7693e..14988514158 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.0.53
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
@@ -14,8 +14,7 @@ DISTNAME=	control-center-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 0524ffcbb85..986850c6ce1 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8
+MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e
diff --git a/sysutils/gnomecontrolcenter2/files/patch-bn b/sysutils/gnomecontrolcenter2/files/patch-bn
index e7543a038ea..da5233b1627 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-bn
+++ b/sysutils/gnomecontrolcenter2/files/patch-bn
@@ -25,7 +25,7 @@
  
  
 -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libcapplet_la_LDFLAGS = -version-info 1:0:0
++libcapplet_la_LDFLAGS = -version-info 4:0:0
  libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS)
  
  include_HEADERS = capplet-widget.h
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index ff9d67b2885..984a3c4e056 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -16,7 +16,7 @@ etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.so
-lib/libcapplet.so.1
+lib/libcapplet.so.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/apps/Settings/Desktop/.directory
@@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 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
 share/gnome/apps/Settings/Peripherals/.directory
@@ -35,10 +39,7 @@ 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/gnome-edit-properties.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/apps/Settings/mime-type.desktop
-share/gnome/apps/Settings/url-properties.desktop
 share/gnome/control-center/.data/3d.desktop
 share/gnome/control-center/.data/3d.png
 share/gnome/control-center/.data/Ant.desktop
@@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop
 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/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
 share/gnome/control-center/Peripherals/.directory
@@ -185,29 +190,52 @@ 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/control-center/gnome-edit-properties.desktop
-share/gnome/control-center/mime-type.desktop
-share/gnome/control-center/url-properties.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/index.html
+share/gnome/help/control-center/C/topic.dat
 share/gnome/idl/control-center.idl
+share/gnome/pixmaps/ccsplash.png
 share/gnome/pixmaps/control-center.png
 share/gnome/wm-properties/Enlightenment.desktop
 share/gnome/wm-properties/IceWM.desktop
 share/gnome/wm-properties/WindowMaker.desktop
 share/gnome/wm-properties/Scwm.desktop
 share/gnome/wm-properties/twm.desktop
+share/locale/ca/LC_MESSAGES/control-center.mo
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
+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/fi/LC_MESSAGES/control-center.mo
 share/locale/fr/LC_MESSAGES/control-center.mo
 share/locale/ga/LC_MESSAGES/control-center.mo
+share/locale/gl/LC_MESSAGES/control-center.mo
+share/locale/hr/LC_MESSAGES/control-center.mo
 share/locale/hu/LC_MESSAGES/control-center.mo
 share/locale/it/LC_MESSAGES/control-center.mo
 share/locale/ja/LC_MESSAGES/control-center.mo
 share/locale/ko/LC_MESSAGES/control-center.mo
+share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
@@ -216,11 +244,21 @@ 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/sv/LC_MESSAGES/control-center.mo
+share/locale/tr/LC_MESSAGES/control-center.mo
+share/locale/uk/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/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figs
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrm share/gnome/help
 @dirrm share/gnome/control-center/UIOptions
 @dirrm share/gnome/control-center/Session
 @dirrm share/gnome/control-center/Peripherals
 @dirrm share/gnome/control-center/Multimedia
+@dirrm share/gnome/control-center/Documents
 @dirrm share/gnome/control-center/Desktop
 @dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
@@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/apps/Settings/Session
 @dirrm share/gnome/apps/Settings/Peripherals
 @dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Documents
 @dirrm share/gnome/apps/Settings/Desktop
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 98adf74d6ec..b288cc078ab 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 879de51197b..6cd6b1f5570 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gtop-1.0.7.tar.gz) = aa1f621dbe6461c5d6edd8d952c02d25
+MD5 (gtop-1.0.8.tar.gz) = f5749f352281c0e68d1d585207b9bec0
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index a1d92205fe0..80350981dcb 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -1,7 +1,8 @@
 bin/gtop
-share/gnome/apps/Utilities/gtop.desktop
+share/gnome/apps/System/gtop.desktop
 share/gnome/gtoprc
-share/gnome/help/gtop/C/c12.html
+share/gnome/help/gtop/C/credits.html
+share/gnome/help/gtop/C/errata.html
 share/gnome/help/gtop/C/figs/gtop-fs-1.png
 share/gnome/help/gtop/C/figs/gtop-fs-2.png
 share/gnome/help/gtop/C/figs/gtop-mem.png
@@ -11,25 +12,28 @@ share/gnome/help/gtop/C/figs/gtop-pic-middle.png
 share/gnome/help/gtop/C/figs/gtop-pic-top.png
 share/gnome/help/gtop/C/figs/gtop-prefs.png
 share/gnome/help/gtop/C/figs/gtop-proc.png
+share/gnome/help/gtop/C/filesystems.html
+share/gnome/help/gtop/C/gtop.html
 share/gnome/help/gtop/C/index.html
+share/gnome/help/gtop/C/memory.html
+share/gnome/help/gtop/C/more-info.html
+share/gnome/help/gtop/C/preferences.html
+share/gnome/help/gtop/C/processes.html
 share/gnome/help/gtop/C/topic.dat
-share/gnome/help/gtop/C/x365.html
-share/gnome/help/gtop/C/x436.html
-share/gnome/help/gtop/C/x45.html
-share/gnome/help/gtop/C/x511.html
-share/gnome/help/gtop/C/x619.html
-share/gnome/help/gtop/C/x627.html
-share/gnome/help/gtop/C/x656.html
 share/gnome/pixmaps/gnome-gtop.png
+share/locale/ca/LC_MESSAGES/gtop.mo
 share/locale/cs/LC_MESSAGES/gtop.mo
 share/locale/da/LC_MESSAGES/gtop.mo
 share/locale/de/LC_MESSAGES/gtop.mo
+share/locale/el/LC_MESSAGES/gtop.mo
 share/locale/es/LC_MESSAGES/gtop.mo
 share/locale/fr/LC_MESSAGES/gtop.mo
 share/locale/ga/LC_MESSAGES/gtop.mo
+share/locale/gl/LC_MESSAGES/gtop.mo
 share/locale/it/LC_MESSAGES/gtop.mo
 share/locale/ja/LC_MESSAGES/gtop.mo
 share/locale/ko/LC_MESSAGES/gtop.mo
+share/locale/lt/LC_MESSAGES/gtop.mo
 share/locale/no/LC_MESSAGES/gtop.mo
 share/locale/pl/LC_MESSAGES/gtop.mo
 share/locale/pt/LC_MESSAGES/gtop.mo
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 98adf74d6ec..b288cc078ab 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gtop
 
 MAINTAINER=	ade@FreeBSD.org
 
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo
index 879de51197b..6cd6b1f5570 100644
--- a/sysutils/gtop/distinfo
+++ b/sysutils/gtop/distinfo
@@ -1 +1 @@
-MD5 (gtop-1.0.7.tar.gz) = aa1f621dbe6461c5d6edd8d952c02d25
+MD5 (gtop-1.0.8.tar.gz) = f5749f352281c0e68d1d585207b9bec0
diff --git a/sysutils/gtop/pkg-plist b/sysutils/gtop/pkg-plist
index a1d92205fe0..80350981dcb 100644
--- a/sysutils/gtop/pkg-plist
+++ b/sysutils/gtop/pkg-plist
@@ -1,7 +1,8 @@
 bin/gtop
-share/gnome/apps/Utilities/gtop.desktop
+share/gnome/apps/System/gtop.desktop
 share/gnome/gtoprc
-share/gnome/help/gtop/C/c12.html
+share/gnome/help/gtop/C/credits.html
+share/gnome/help/gtop/C/errata.html
 share/gnome/help/gtop/C/figs/gtop-fs-1.png
 share/gnome/help/gtop/C/figs/gtop-fs-2.png
 share/gnome/help/gtop/C/figs/gtop-mem.png
@@ -11,25 +12,28 @@ share/gnome/help/gtop/C/figs/gtop-pic-middle.png
 share/gnome/help/gtop/C/figs/gtop-pic-top.png
 share/gnome/help/gtop/C/figs/gtop-prefs.png
 share/gnome/help/gtop/C/figs/gtop-proc.png
+share/gnome/help/gtop/C/filesystems.html
+share/gnome/help/gtop/C/gtop.html
 share/gnome/help/gtop/C/index.html
+share/gnome/help/gtop/C/memory.html
+share/gnome/help/gtop/C/more-info.html
+share/gnome/help/gtop/C/preferences.html
+share/gnome/help/gtop/C/processes.html
 share/gnome/help/gtop/C/topic.dat
-share/gnome/help/gtop/C/x365.html
-share/gnome/help/gtop/C/x436.html
-share/gnome/help/gtop/C/x45.html
-share/gnome/help/gtop/C/x511.html
-share/gnome/help/gtop/C/x619.html
-share/gnome/help/gtop/C/x627.html
-share/gnome/help/gtop/C/x656.html
 share/gnome/pixmaps/gnome-gtop.png
+share/locale/ca/LC_MESSAGES/gtop.mo
 share/locale/cs/LC_MESSAGES/gtop.mo
 share/locale/da/LC_MESSAGES/gtop.mo
 share/locale/de/LC_MESSAGES/gtop.mo
+share/locale/el/LC_MESSAGES/gtop.mo
 share/locale/es/LC_MESSAGES/gtop.mo
 share/locale/fr/LC_MESSAGES/gtop.mo
 share/locale/ga/LC_MESSAGES/gtop.mo
+share/locale/gl/LC_MESSAGES/gtop.mo
 share/locale/it/LC_MESSAGES/gtop.mo
 share/locale/ja/LC_MESSAGES/gtop.mo
 share/locale/ko/LC_MESSAGES/gtop.mo
+share/locale/lt/LC_MESSAGES/gtop.mo
 share/locale/no/LC_MESSAGES/gtop.mo
 share/locale/pl/LC_MESSAGES/gtop.mo
 share/locale/pt/LC_MESSAGES/gtop.mo