Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

22 files changed, 377 insertions, 172 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 7c9fdbdb2c9d..5ad347088d19 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	control-center
-# Version required:			0.99.3.1
+# Version required:			1.0.1
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $
 #
 
-DISTNAME=	control-center-0.99.3.1
-PKGNAME=	gnomecontrolcenter-0.99.3.1
+DISTNAME=	control-center-1.0.1
+PKGNAME=	gnomecontrolcenter-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index cdf113f00764..a3cdd5cebb34 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74
+MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb
diff --git a/sysutils/gnome-control-center/files/patch-ad b/sysutils/gnome-control-center/files/patch-ad
new file mode 100644
index 000000000000..c27189a35ee9
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-ad
@@ -0,0 +1,11 @@
+--- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
++++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
+@@ -210,7 +210,7 @@
+         gchar *tempdir;
+         gchar *name;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         wm_list_read_dir (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index d2038f5a2148..fe491fb06b90 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,24 +1,40 @@
 bin/background-properties-capplet
 bin/bell-properties-capplet
-bin/e-conf
+bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
+bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
 bin/url-properties
+bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so
-lib/libcapplet.so.0.99
+lib/libcapplet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/cappletConf.sh
-share/gnome/apps/System/gnomecc.desktop
+share/gnome/apps/Settings/application.desktop
+share/gnome/apps/Settings/background-properties.desktop
+share/gnome/apps/Settings/bell-properties.desktop
+share/gnome/apps/Settings/dialogs.desktop
+share/gnome/apps/Settings/gnome-edit-properties.desktop
+share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/keyboard-properties.desktop
+share/gnome/apps/Settings/mdi.desktop
+share/gnome/apps/Settings/mouse-properties.desktop
+share/gnome/apps/Settings/screensaver-properties.desktop
+share/gnome/apps/Settings/session-properties.desktop
+share/gnome/apps/Settings/sound-properties.desktop
+share/gnome/apps/Settings/theme-selector.desktop
+share/gnome/apps/Settings/url-properties.desktop
+share/gnome/apps/Settings/wm-properties.desktop
 share/gnome/control-center/.data/Ant.desktop
 share/gnome/control-center/.data/Attraction.desktop
 share/gnome/control-center/.data/Blitspin.desktop
@@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xroger.desktop
 share/gnome/control-center/.data/ant.png
+share/gnome/control-center/.data/attraction.png
+share/gnome/control-center/.data/blitspin.png
 share/gnome/control-center/.data/bouboule.png
+share/gnome/control-center/.data/braid.png
+share/gnome/control-center/.data/bsod.png
+share/gnome/control-center/.data/bubbles.png
+share/gnome/control-center/.data/coral.png
+share/gnome/control-center/.data/crystal.png
+share/gnome/control-center/.data/cynosure.png
+share/gnome/control-center/.data/decayscreen.png
 share/gnome/control-center/.data/deco.png
+share/gnome/control-center/.data/discrete.png
+share/gnome/control-center/.data/drift.png
+share/gnome/control-center/.data/epicycle.png
+share/gnome/control-center/.data/flag.png
+share/gnome/control-center/.data/flame.png
+share/gnome/control-center/.data/forest.png
+share/gnome/control-center/.data/goop.png
+share/gnome/control-center/.data/grav.png
+share/gnome/control-center/.data/greynetic.png
+share/gnome/control-center/.data/halo.png
+share/gnome/control-center/.data/helix.png
+share/gnome/control-center/.data/hopalong.png
+share/gnome/control-center/.data/hypercube.png
+share/gnome/control-center/.data/ifs.png
+share/gnome/control-center/.data/julia.png
+share/gnome/control-center/.data/kaleidescope.png
 share/gnome/control-center/.data/laser.png
+share/gnome/control-center/.data/lightning.png
+share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
 share/gnome/control-center/.directory
-share/gnome/control-center/Appearances/.directory
-share/gnome/control-center/Appearances/theme-selector.desktop
-share/gnome/control-center/Appearances/ui-properties/.directory
-share/gnome/control-center/Appearances/ui-properties/application.desktop
-share/gnome/control-center/Appearances/ui-properties/dialogs.desktop
-share/gnome/control-center/Appearances/ui-properties/mdi.desktop
-share/gnome/control-center/Inputdevs/.directory
-share/gnome/control-center/Inputdevs/bell-properties.desktop
-share/gnome/control-center/Inputdevs/keyboard-properties.desktop
-share/gnome/control-center/Inputdevs/mouse-properties.desktop
+share/gnome/control-center/Desktop/.directory
+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/Multimedia/.directory
+share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/WindowManager/.directory
-share/gnome/control-center/Workspace/.directory
-share/gnome/control-center/Workspace/Enlightenment.desktop
-share/gnome/control-center/Workspace/background-properties.desktop
-share/gnome/control-center/Workspace/screensaver-properties.desktop
-share/gnome/control-center/Workspace/url-properties.desktop
+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/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/session-properties.desktop
+share/gnome/control-center/url-properties.desktop
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
-share/locale/ca/LC_MESSAGES/control-center.mo
+share/gnome/wm-properties/Enlightenment.desktop
+share/gnome/wm-properties/IceWM.desktop
+share/gnome/wm-properties/WindowMaker.desktop
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
@@ -133,11 +178,10 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/control-center/.data
-@dirrm share/gnome/control-center/Appearances/ui-properties
-@dirrm share/gnome/control-center/Appearances
-@dirrm share/gnome/control-center/Inputdevs
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals 
 @dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/WindowManager
-@dirrm share/gnome/control-center/Workspace
+@dirrm share/gnome/control-center/Desktop 
+@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 7c9fdbdb2c9d..5ad347088d19 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	control-center
-# Version required:			0.99.3.1
+# Version required:			1.0.1
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $
 #
 
-DISTNAME=	control-center-0.99.3.1
-PKGNAME=	gnomecontrolcenter-0.99.3.1
+DISTNAME=	control-center-1.0.1
+PKGNAME=	gnomecontrolcenter-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/sysutils/gnome-control-center1/distinfo b/sysutils/gnome-control-center1/distinfo
index cdf113f00764..a3cdd5cebb34 100644
--- a/sysutils/gnome-control-center1/distinfo
+++ b/sysutils/gnome-control-center1/distinfo
@@ -1 +1 @@
-MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74
+MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb
diff --git a/sysutils/gnome-control-center1/files/patch-ad b/sysutils/gnome-control-center1/files/patch-ad
new file mode 100644
index 000000000000..c27189a35ee9
--- /dev/null
+++ b/sysutils/gnome-control-center1/files/patch-ad
@@ -0,0 +1,11 @@
+--- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
++++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
+@@ -210,7 +210,7 @@
+         gchar *tempdir;
+         gchar *name;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         wm_list_read_dir (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index d2038f5a2148..fe491fb06b90 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -1,24 +1,40 @@
 bin/background-properties-capplet
 bin/bell-properties-capplet
-bin/e-conf
+bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
+bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
 bin/url-properties
+bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so
-lib/libcapplet.so.0.99
+lib/libcapplet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/cappletConf.sh
-share/gnome/apps/System/gnomecc.desktop
+share/gnome/apps/Settings/application.desktop
+share/gnome/apps/Settings/background-properties.desktop
+share/gnome/apps/Settings/bell-properties.desktop
+share/gnome/apps/Settings/dialogs.desktop
+share/gnome/apps/Settings/gnome-edit-properties.desktop
+share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/keyboard-properties.desktop
+share/gnome/apps/Settings/mdi.desktop
+share/gnome/apps/Settings/mouse-properties.desktop
+share/gnome/apps/Settings/screensaver-properties.desktop
+share/gnome/apps/Settings/session-properties.desktop
+share/gnome/apps/Settings/sound-properties.desktop
+share/gnome/apps/Settings/theme-selector.desktop
+share/gnome/apps/Settings/url-properties.desktop
+share/gnome/apps/Settings/wm-properties.desktop
 share/gnome/control-center/.data/Ant.desktop
 share/gnome/control-center/.data/Attraction.desktop
 share/gnome/control-center/.data/Blitspin.desktop
@@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xroger.desktop
 share/gnome/control-center/.data/ant.png
+share/gnome/control-center/.data/attraction.png
+share/gnome/control-center/.data/blitspin.png
 share/gnome/control-center/.data/bouboule.png
+share/gnome/control-center/.data/braid.png
+share/gnome/control-center/.data/bsod.png
+share/gnome/control-center/.data/bubbles.png
+share/gnome/control-center/.data/coral.png
+share/gnome/control-center/.data/crystal.png
+share/gnome/control-center/.data/cynosure.png
+share/gnome/control-center/.data/decayscreen.png
 share/gnome/control-center/.data/deco.png
+share/gnome/control-center/.data/discrete.png
+share/gnome/control-center/.data/drift.png
+share/gnome/control-center/.data/epicycle.png
+share/gnome/control-center/.data/flag.png
+share/gnome/control-center/.data/flame.png
+share/gnome/control-center/.data/forest.png
+share/gnome/control-center/.data/goop.png
+share/gnome/control-center/.data/grav.png
+share/gnome/control-center/.data/greynetic.png
+share/gnome/control-center/.data/halo.png
+share/gnome/control-center/.data/helix.png
+share/gnome/control-center/.data/hopalong.png
+share/gnome/control-center/.data/hypercube.png
+share/gnome/control-center/.data/ifs.png
+share/gnome/control-center/.data/julia.png
+share/gnome/control-center/.data/kaleidescope.png
 share/gnome/control-center/.data/laser.png
+share/gnome/control-center/.data/lightning.png
+share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
 share/gnome/control-center/.directory
-share/gnome/control-center/Appearances/.directory
-share/gnome/control-center/Appearances/theme-selector.desktop
-share/gnome/control-center/Appearances/ui-properties/.directory
-share/gnome/control-center/Appearances/ui-properties/application.desktop
-share/gnome/control-center/Appearances/ui-properties/dialogs.desktop
-share/gnome/control-center/Appearances/ui-properties/mdi.desktop
-share/gnome/control-center/Inputdevs/.directory
-share/gnome/control-center/Inputdevs/bell-properties.desktop
-share/gnome/control-center/Inputdevs/keyboard-properties.desktop
-share/gnome/control-center/Inputdevs/mouse-properties.desktop
+share/gnome/control-center/Desktop/.directory
+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/Multimedia/.directory
+share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/WindowManager/.directory
-share/gnome/control-center/Workspace/.directory
-share/gnome/control-center/Workspace/Enlightenment.desktop
-share/gnome/control-center/Workspace/background-properties.desktop
-share/gnome/control-center/Workspace/screensaver-properties.desktop
-share/gnome/control-center/Workspace/url-properties.desktop
+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/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/session-properties.desktop
+share/gnome/control-center/url-properties.desktop
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
-share/locale/ca/LC_MESSAGES/control-center.mo
+share/gnome/wm-properties/Enlightenment.desktop
+share/gnome/wm-properties/IceWM.desktop
+share/gnome/wm-properties/WindowMaker.desktop
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
@@ -133,11 +178,10 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/control-center/.data
-@dirrm share/gnome/control-center/Appearances/ui-properties
-@dirrm share/gnome/control-center/Appearances
-@dirrm share/gnome/control-center/Inputdevs
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals 
 @dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/WindowManager
-@dirrm share/gnome/control-center/Workspace
+@dirrm share/gnome/control-center/Desktop 
+@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 1794d6caf874..1915b37f6850 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	gtop
-# Version required:			0.99.2
+# Version required:			1.0.1
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $
 #
 
-DISTNAME=	gtop-0.99.2
+DISTNAME=	gtop-1.0.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/
-MASTER_SITE_SUBDIR=	gtop
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -23,11 +22,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
-post-install:
-		chown root.kmem ${PREFIX}/bin/gtop
-		chmod 2555 ${PREFIX}/bin/gtop
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index a17a749f8909..c3a5606cd3e6 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1 +1 @@
-MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0
+MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 7c9fdbdb2c9d..5ad347088d19 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	control-center
-# Version required:			0.99.3.1
+# Version required:			1.0.1
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $
 #
 
-DISTNAME=	control-center-0.99.3.1
-PKGNAME=	gnomecontrolcenter-0.99.3.1
+DISTNAME=	control-center-1.0.1
+PKGNAME=	gnomecontrolcenter-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo
index cdf113f00764..a3cdd5cebb34 100644
--- a/sysutils/gnomecontrolcenter/distinfo
+++ b/sysutils/gnomecontrolcenter/distinfo
@@ -1 +1 @@
-MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74
+MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb
diff --git a/sysutils/gnomecontrolcenter/files/patch-ad b/sysutils/gnomecontrolcenter/files/patch-ad
new file mode 100644
index 000000000000..c27189a35ee9
--- /dev/null
+++ b/sysutils/gnomecontrolcenter/files/patch-ad
@@ -0,0 +1,11 @@
+--- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
++++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
+@@ -210,7 +210,7 @@
+         gchar *tempdir;
+         gchar *name;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         wm_list_read_dir (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
index d2038f5a2148..fe491fb06b90 100644
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ b/sysutils/gnomecontrolcenter/pkg-plist
@@ -1,24 +1,40 @@
 bin/background-properties-capplet
 bin/bell-properties-capplet
-bin/e-conf
+bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
+bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
 bin/url-properties
+bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so
-lib/libcapplet.so.0.99
+lib/libcapplet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/cappletConf.sh
-share/gnome/apps/System/gnomecc.desktop
+share/gnome/apps/Settings/application.desktop
+share/gnome/apps/Settings/background-properties.desktop
+share/gnome/apps/Settings/bell-properties.desktop
+share/gnome/apps/Settings/dialogs.desktop
+share/gnome/apps/Settings/gnome-edit-properties.desktop
+share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/keyboard-properties.desktop
+share/gnome/apps/Settings/mdi.desktop
+share/gnome/apps/Settings/mouse-properties.desktop
+share/gnome/apps/Settings/screensaver-properties.desktop
+share/gnome/apps/Settings/session-properties.desktop
+share/gnome/apps/Settings/sound-properties.desktop
+share/gnome/apps/Settings/theme-selector.desktop
+share/gnome/apps/Settings/url-properties.desktop
+share/gnome/apps/Settings/wm-properties.desktop
 share/gnome/control-center/.data/Ant.desktop
 share/gnome/control-center/.data/Attraction.desktop
 share/gnome/control-center/.data/Blitspin.desktop
@@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xroger.desktop
 share/gnome/control-center/.data/ant.png
+share/gnome/control-center/.data/attraction.png
+share/gnome/control-center/.data/blitspin.png
 share/gnome/control-center/.data/bouboule.png
+share/gnome/control-center/.data/braid.png
+share/gnome/control-center/.data/bsod.png
+share/gnome/control-center/.data/bubbles.png
+share/gnome/control-center/.data/coral.png
+share/gnome/control-center/.data/crystal.png
+share/gnome/control-center/.data/cynosure.png
+share/gnome/control-center/.data/decayscreen.png
 share/gnome/control-center/.data/deco.png
+share/gnome/control-center/.data/discrete.png
+share/gnome/control-center/.data/drift.png
+share/gnome/control-center/.data/epicycle.png
+share/gnome/control-center/.data/flag.png
+share/gnome/control-center/.data/flame.png
+share/gnome/control-center/.data/forest.png
+share/gnome/control-center/.data/goop.png
+share/gnome/control-center/.data/grav.png
+share/gnome/control-center/.data/greynetic.png
+share/gnome/control-center/.data/halo.png
+share/gnome/control-center/.data/helix.png
+share/gnome/control-center/.data/hopalong.png
+share/gnome/control-center/.data/hypercube.png
+share/gnome/control-center/.data/ifs.png
+share/gnome/control-center/.data/julia.png
+share/gnome/control-center/.data/kaleidescope.png
 share/gnome/control-center/.data/laser.png
+share/gnome/control-center/.data/lightning.png
+share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
 share/gnome/control-center/.directory
-share/gnome/control-center/Appearances/.directory
-share/gnome/control-center/Appearances/theme-selector.desktop
-share/gnome/control-center/Appearances/ui-properties/.directory
-share/gnome/control-center/Appearances/ui-properties/application.desktop
-share/gnome/control-center/Appearances/ui-properties/dialogs.desktop
-share/gnome/control-center/Appearances/ui-properties/mdi.desktop
-share/gnome/control-center/Inputdevs/.directory
-share/gnome/control-center/Inputdevs/bell-properties.desktop
-share/gnome/control-center/Inputdevs/keyboard-properties.desktop
-share/gnome/control-center/Inputdevs/mouse-properties.desktop
+share/gnome/control-center/Desktop/.directory
+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/Multimedia/.directory
+share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/WindowManager/.directory
-share/gnome/control-center/Workspace/.directory
-share/gnome/control-center/Workspace/Enlightenment.desktop
-share/gnome/control-center/Workspace/background-properties.desktop
-share/gnome/control-center/Workspace/screensaver-properties.desktop
-share/gnome/control-center/Workspace/url-properties.desktop
+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/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/session-properties.desktop
+share/gnome/control-center/url-properties.desktop
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
-share/locale/ca/LC_MESSAGES/control-center.mo
+share/gnome/wm-properties/Enlightenment.desktop
+share/gnome/wm-properties/IceWM.desktop
+share/gnome/wm-properties/WindowMaker.desktop
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
@@ -133,11 +178,10 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/control-center/.data
-@dirrm share/gnome/control-center/Appearances/ui-properties
-@dirrm share/gnome/control-center/Appearances
-@dirrm share/gnome/control-center/Inputdevs
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals 
 @dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/WindowManager
-@dirrm share/gnome/control-center/Workspace
+@dirrm share/gnome/control-center/Desktop 
+@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 7c9fdbdb2c9d..5ad347088d19 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	control-center
-# Version required:			0.99.3.1
+# Version required:			1.0.1
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $
 #
 
-DISTNAME=	control-center-0.99.3.1
-PKGNAME=	gnomecontrolcenter-0.99.3.1
+DISTNAME=	control-center-1.0.1
+PKGNAME=	gnomecontrolcenter-1.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	control-center
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
 post-install:
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index cdf113f00764..a3cdd5cebb34 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74
+MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ad b/sysutils/gnomecontrolcenter2/files/patch-ad
new file mode 100644
index 000000000000..c27189a35ee9
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-ad
@@ -0,0 +1,11 @@
+--- capplets/wm-properties/wm-list.c.orig	Tue Mar  2 22:53:29 1999
++++ capplets/wm-properties/wm-list.c	Tue Mar  2 22:53:52 1999
+@@ -210,7 +210,7 @@
+         gchar *tempdir;
+         gchar *name;
+         
+-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
+         wm_list_read_dir (tempdir, FALSE);
+         g_free (tempdir);
+         
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index d2038f5a2148..fe491fb06b90 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -1,24 +1,40 @@
 bin/background-properties-capplet
 bin/bell-properties-capplet
-bin/e-conf
+bin/gnome-edit-properties-capplet
 bin/gnomecc
 bin/keyboard-properties
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
+bin/session-properties-capplet
 bin/sound-properties
 bin/theme-selector-capplet
 bin/ui-properties
 bin/url-properties
+bin/wm-properties-capplet
 etc/CORBA/servers/gnomecc.gnorba
+etc/cappletConf.sh
 include/capplet-widget.h
 lib/libcapplet.a
 lib/libcapplet.la
 lib/libcapplet.so
-lib/libcapplet.so.0.99
+lib/libcapplet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/cappletConf.sh
-share/gnome/apps/System/gnomecc.desktop
+share/gnome/apps/Settings/application.desktop
+share/gnome/apps/Settings/background-properties.desktop
+share/gnome/apps/Settings/bell-properties.desktop
+share/gnome/apps/Settings/dialogs.desktop
+share/gnome/apps/Settings/gnome-edit-properties.desktop
+share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/apps/Settings/keyboard-properties.desktop
+share/gnome/apps/Settings/mdi.desktop
+share/gnome/apps/Settings/mouse-properties.desktop
+share/gnome/apps/Settings/screensaver-properties.desktop
+share/gnome/apps/Settings/session-properties.desktop
+share/gnome/apps/Settings/sound-properties.desktop
+share/gnome/apps/Settings/theme-selector.desktop
+share/gnome/apps/Settings/url-properties.desktop
+share/gnome/apps/Settings/wm-properties.desktop
 share/gnome/control-center/.data/Ant.desktop
 share/gnome/control-center/.data/Attraction.desktop
 share/gnome/control-center/.data/Blitspin.desktop
@@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop
 share/gnome/control-center/.data/Xlyap.desktop
 share/gnome/control-center/.data/Xroger.desktop
 share/gnome/control-center/.data/ant.png
+share/gnome/control-center/.data/attraction.png
+share/gnome/control-center/.data/blitspin.png
 share/gnome/control-center/.data/bouboule.png
+share/gnome/control-center/.data/braid.png
+share/gnome/control-center/.data/bsod.png
+share/gnome/control-center/.data/bubbles.png
+share/gnome/control-center/.data/coral.png
+share/gnome/control-center/.data/crystal.png
+share/gnome/control-center/.data/cynosure.png
+share/gnome/control-center/.data/decayscreen.png
 share/gnome/control-center/.data/deco.png
+share/gnome/control-center/.data/discrete.png
+share/gnome/control-center/.data/drift.png
+share/gnome/control-center/.data/epicycle.png
+share/gnome/control-center/.data/flag.png
+share/gnome/control-center/.data/flame.png
+share/gnome/control-center/.data/forest.png
+share/gnome/control-center/.data/goop.png
+share/gnome/control-center/.data/grav.png
+share/gnome/control-center/.data/greynetic.png
+share/gnome/control-center/.data/halo.png
+share/gnome/control-center/.data/helix.png
+share/gnome/control-center/.data/hopalong.png
+share/gnome/control-center/.data/hypercube.png
+share/gnome/control-center/.data/ifs.png
+share/gnome/control-center/.data/julia.png
+share/gnome/control-center/.data/kaleidescope.png
 share/gnome/control-center/.data/laser.png
+share/gnome/control-center/.data/lightning.png
+share/gnome/control-center/.data/lisa.png
 share/gnome/control-center/.data/qix.png
 share/gnome/control-center/.data/starfish.png
 share/gnome/control-center/.directory
-share/gnome/control-center/Appearances/.directory
-share/gnome/control-center/Appearances/theme-selector.desktop
-share/gnome/control-center/Appearances/ui-properties/.directory
-share/gnome/control-center/Appearances/ui-properties/application.desktop
-share/gnome/control-center/Appearances/ui-properties/dialogs.desktop
-share/gnome/control-center/Appearances/ui-properties/mdi.desktop
-share/gnome/control-center/Inputdevs/.directory
-share/gnome/control-center/Inputdevs/bell-properties.desktop
-share/gnome/control-center/Inputdevs/keyboard-properties.desktop
-share/gnome/control-center/Inputdevs/mouse-properties.desktop
+share/gnome/control-center/Desktop/.directory
+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/Multimedia/.directory
+share/gnome/control-center/Multimedia/bell-properties.desktop
 share/gnome/control-center/Multimedia/sound-properties.desktop
-share/gnome/control-center/WindowManager/.directory
-share/gnome/control-center/Workspace/.directory
-share/gnome/control-center/Workspace/Enlightenment.desktop
-share/gnome/control-center/Workspace/background-properties.desktop
-share/gnome/control-center/Workspace/screensaver-properties.desktop
-share/gnome/control-center/Workspace/url-properties.desktop
+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/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/session-properties.desktop
+share/gnome/control-center/url-properties.desktop
 share/gnome/idl/control-center.idl
 share/gnome/pixmaps/control-center.png
-share/locale/ca/LC_MESSAGES/control-center.mo
+share/gnome/wm-properties/Enlightenment.desktop
+share/gnome/wm-properties/IceWM.desktop
+share/gnome/wm-properties/WindowMaker.desktop
 share/locale/cs/LC_MESSAGES/control-center.mo
 share/locale/da/LC_MESSAGES/control-center.mo
 share/locale/de/LC_MESSAGES/control-center.mo
@@ -133,11 +178,10 @@ share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
 share/locale/ru/LC_MESSAGES/control-center.mo
 share/locale/sv/LC_MESSAGES/control-center.mo
-@dirrm share/gnome/control-center/.data
-@dirrm share/gnome/control-center/Appearances/ui-properties
-@dirrm share/gnome/control-center/Appearances
-@dirrm share/gnome/control-center/Inputdevs
+@dirrm share/gnome/wm-properties
+@dirrm share/gnome/control-center/UIOptions
+@dirrm share/gnome/control-center/Peripherals 
 @dirrm share/gnome/control-center/Multimedia
-@dirrm share/gnome/control-center/WindowManager
-@dirrm share/gnome/control-center/Workspace
+@dirrm share/gnome/control-center/Desktop 
+@dirrm share/gnome/control-center/.data
 @dirrm share/gnome/control-center
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 1794d6caf874..1915b37f6850 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	gtop
-# Version required:			0.99.2
+# Version required:			1.0.1
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $
 #
 
-DISTNAME=	gtop-0.99.2
+DISTNAME=	gtop-1.0.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/
-MASTER_SITE_SUBDIR=	gtop
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -23,11 +22,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
-post-install:
-		chown root.kmem ${PREFIX}/bin/gtop
-		chmod 2555 ${PREFIX}/bin/gtop
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index a17a749f8909..c3a5606cd3e6 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0
+MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 1794d6caf874..1915b37f6850 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	gtop
-# Version required:			0.99.2
+# Version required:			1.0.1
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/01/27 08:31:52 fenner Exp $
+# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $
 #
 
-DISTNAME=	gtop-0.99.2
+DISTNAME=	gtop-1.0.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/
-MASTER_SITE_SUBDIR=	gtop
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -23,11 +22,7 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 
-post-install:
-		chown root.kmem ${PREFIX}/bin/gtop
-		chmod 2555 ${PREFIX}/bin/gtop
-
 .include <bsd.port.mk>
diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo
index a17a749f8909..c3a5606cd3e6 100644
--- a/sysutils/gtop/distinfo
+++ b/sysutils/gtop/distinfo
@@ -1 +1 @@
-MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0
+MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2