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>

4 files changed, 48 insertions, 54 deletions

diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index afa832d7eb62..638052b77150 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:	gnomeutils
-# Version required:			0.99.5
+# Version required:			1.0.1
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $
+# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $
 #
 
-DISTNAME=	gnome-utils-0.99.5
-PKGNAME=	gnomeutils-0.99.5
-CATEGORIES=	misc
+DISTNAME=	gnome-utils-1.0.1
+PKGNAME=	gnomeutils-1.0.1
+CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-utils
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	obgnome.1:${PORTSDIR}/lang/gnomeobjc
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -24,7 +25,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"
 
 MAN1=		gtt.1
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index 32cec07ed8c2..b35b2a17cd4c 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583
+MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a
diff --git a/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa
index 7d8da8ddc7e7..2e73d96fd7b0 100644
--- a/misc/gnomeutils2/files/patch-aa
+++ b/misc/gnomeutils2/files/patch-aa
@@ -1,36 +1,20 @@
---- configure.orig	Tue Feb  2 09:42:09 1999
-+++ configure	Tue Feb  2 09:43:37 1999
-@@ -1108,13 +1108,13 @@
- 	    fi
- 	
- 	    if test "$no_gnome_config" = "yes"; then
--              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1113: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	      if test -f $gnome_prefix/gnomeConf.sh; then
-+              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1113: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	      if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	        echo "$ac_t""found" 1>&6
- 	        echo "loading gnome configuration from" \
--		     "$gnome_prefix/gnomeConf.sh"
--	        . $gnome_prefix/gnomeConf.sh
-+		     "$prefix/share/gnome/gnomeConf.sh"
-+	        . $prefix/share/gnome/gnomeConf.sh
- 	        
- 	      else
- 	        echo "$ac_t""not found" 1>&6
-@@ -3121,10 +3121,10 @@
- 
- if test $OBJECTIVE_C = yes; then
+--- configure.orig	Tue Mar  2 00:23:40 1999
++++ configure	Sat Mar  6 23:55:23 1999
+@@ -3143,7 +3143,7 @@
    
--        echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5
--	if test -f $gnome_prefix/obGnomeConf.sh; then
--	    . $gnome_prefix/obGnomeConf.sh
-+        echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5
-+	if test -f $prefix/share/gnome/obGnomeConf.sh; then
-+	    . $prefix/share/gnome/obGnomeConf.sh
- 	    echo "$ac_t""found" 1>&6
- 	else
- 	    echo "$ac_t""not found" 1>&6
+ 	echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6
+ echo "configure:3146: checking for an obGnomeConf.sh" >&5
+-	my_gnome_libdir=`$GNOME_CONFIG --libdir`
++	my_gnome_libdir=`$GNOME_CONFIG --sysconfdir`
+ 	if test -f $my_gnome_libdir/obGnomeConf.sh; then
+ 	    . $my_gnome_libdir/obGnomeConf.sh
+ 	    echo "$ac_t""found $my_gnome_libdir" 1>&6
+@@ -5389,7 +5389,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist
index 61b605449a7b..43750e5c635e 100644
--- a/misc/gnomeutils2/pkg-plist
+++ b/misc/gnomeutils2/pkg-plist
@@ -15,10 +15,11 @@ bin/gw
 bin/splac
 bin/splash
 share/gnome/apps/Applications/ghex.desktop
-share/gnome/apps/Productivity/gtt.desktop
-share/gnome/apps/System/gshutdown.desktop
+share/gnome/apps/Applications/gtt.desktop
+share/gnome/apps/Settings/gshutdown.desktop
 share/gnome/apps/Utilities/gcalc.desktop
 share/gnome/apps/Utilities/gcolorsel.desktop
+share/gnome/apps/Utilities/gdiskfree.desktop
 share/gnome/apps/Utilities/gfontsel.desktop
 share/gnome/apps/Utilities/gless.desktop
 share/gnome/apps/Utilities/gsearchtool.desktop
@@ -39,6 +40,10 @@ share/gnome/help/gstripchart/C/index.html
 share/gnome/help/gstripchart/C/topic.dat
 share/gnome/help/gtt/C/index.html
 share/gnome/help/gtt/C/topic.dat
+share/gnome/help/gtt/de/index.html
+share/gnome/help/gtt/de/topic.dat
+share/gnome/help/gtt/es/index.html
+share/gnome/help/gtt/es/topic.dat
 share/gnome/pixmaps/gnome-ghex.png
 share/locale/cs/LC_MESSAGES/gnome-utils.mo
 share/locale/de/LC_MESSAGES/gnome-utils.mo
@@ -46,20 +51,24 @@ share/locale/es/LC_MESSAGES/gnome-utils.mo
 share/locale/fi/LC_MESSAGES/gnome-utils.mo
 share/locale/fr/LC_MESSAGES/gnome-utils.mo
 share/locale/ga/LC_MESSAGES/gnome-utils.mo
+share/locale/hu/LC_MESSAGES/gnome-utils.mo
 share/locale/it/LC_MESSAGES/gnome-utils.mo
 share/locale/ja/LC_MESSAGES/gnome-utils.mo
 share/locale/ko/LC_MESSAGES/gnome-utils.mo
 share/locale/no/LC_MESSAGES/gnome-utils.mo
 share/locale/pt/LC_MESSAGES/gnome-utils.mo
+share/locale/ru/LC_MESSAGES/gnome-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-utils.mo
-@dirrm share/gnome/gstripchart
-@dirrm share/gnome/help/ghex/C
-@dirrm share/gnome/help/ghex/es
-@dirrm share/gnome/help/ghex
-@dirrm share/gnome/help/gshutdown/C
-@dirrm share/gnome/help/gshutdown/es
-@dirrm share/gnome/help/gshutdown
-@dirrm share/gnome/help/gstripchart/C
-@dirrm share/gnome/help/gstripchart
+@dirrm share/gnome/help/gtt/es
+@dirrm share/gnome/help/gtt/de
 @dirrm share/gnome/help/gtt/C
 @dirrm share/gnome/help/gtt
+@dirrm share/gnome/help/gstripchart/C
+@dirrm share/gnome/help/gstripchart
+@dirrm share/gnome/help/gshutdown/es
+@dirrm share/gnome/help/gshutdown/C
+@dirrm share/gnome/help/gshutdown
+@dirrm share/gnome/help/ghex/es
+@dirrm share/gnome/help/ghex/C
+@dirrm share/gnome/help/ghex
+@dirrm share/gnome/gstripchart