16 files changed, 176 insertions, 186 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 00478acc31ba..15f0964a4172 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomepim
-# Version required:			0.99.8.1
+# Version required:			1.0.1
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/02/02 07:33:55 vanilla Exp $
+# $Id: Makefile,v 1.4 1999/02/19 04:30:03 vanilla Exp $
 #
 
-DISTNAME=	gnome-pim-0.99.8.1
-PKGNAME=	gnomepim-0.99.8.1
+DISTNAME=	gnome-pim-1.0.1
+PKGNAME=	gnomepim-1.0.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-pim
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -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/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo
index 22af0615e6ba..fc37cd217dd7 100644
--- a/deskutils/gnome-pim/distinfo
+++ b/deskutils/gnome-pim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-0.99.8.1.tar.gz) = 7abb905be1b2018e6ee5053f294b7194
+MD5 (gnome-pim-1.0.1.tar.gz) = 1f299e994a4fceb0f520bf03385510c5
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index e7a8e2b3ab95..e2aad34c8ed5 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,7 +1,7 @@
---- gncal/Makefile.in.orig	Tue Feb  2 09:08:47 1999
-+++ gncal/Makefile.in	Tue Feb  2 09:09:32 1999
-@@ -111,11 +111,11 @@
- YACC = @YACC@
+--- gncal/Makefile.in.orig	Mon Mar  1 00:39:07 1999
++++ gncal/Makefile.in	Wed Mar  3 10:45:10 1999
+@@ -112,11 +112,11 @@
+ ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -help_base = $(datadir)/gnome/help/cal
@@ -14,11 +14,23 @@
  
  
  bin_PROGRAMS = gnomecal
---- gnomecard/Makefile.in.orig	Tue Feb  2 09:09:12 1999
-+++ gnomecard/Makefile.in	Tue Feb  2 09:10:02 1999
-@@ -113,11 +113,11 @@
+@@ -134,7 +134,7 @@
+ EXTRA_DIST =  	gncal.desktop		topic.dat		gnome-cal.html		bell.xpm		recur.xpm
+ 
+ 
+-Productivitydir = $(datadir)/gnome/apps/Applications
++Productivitydir = $(datadir)/apps/Applications
+ 
+ Productivity_DATA = gncal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- gnomecard/Makefile.in.orig	Mon Mar  1 00:39:10 1999
++++ gnomecard/Makefile.in	Wed Mar  3 10:45:39 1999
+@@ -112,13 +112,13 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
  
- SUBDIRS = help
+-SUBDIRS = help
++# SUBDIRS = help
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/cal
@@ -30,6 +42,15 @@
  
  
  bin_PROGRAMS = gnomecard
+@@ -143,7 +143,7 @@
+ EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnomecard.desktop 	gnomecard.gnorba
+ 
+ 
+-Productivitydir = $(datadir)/gnome/apps/Applications
++Productivitydir = $(datadir)/apps/Applications
+ 
+ Productivity_DATA = gnomecard.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnomecard/help/C/Makefile.in.orig	Tue Feb  2 09:10:22 1999
 +++ gnomecard/help/C/Makefile.in	Tue Feb  2 09:10:30 1999
 @@ -112,7 +112,7 @@
@@ -41,14 +62,3 @@
  
  gnomecard_help_DATA =  	index.html			topic.dat
  
---- po/Makefile.in.in.orig	Tue Feb  2 09:11:11 1999
-+++ po/Makefile.in.in	Tue Feb  2 09:11:19 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 5ddc7de7c202..cc17d7df82f4 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -2,20 +2,11 @@ bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecard.gnorba
 lib/libversit.a
-share/gnome/apps/Productivity/gncal.desktop
-share/gnome/apps/Productivity/gnomecard.desktop
+share/gnome/apps/Applications/gncal.desktop
+share/gnome/apps/Applications/gnomecard.desktop
 share/gnome/help/cal/C/gnome-cal.html
 share/gnome/help/cal/C/index.html
 share/gnome/help/cal/C/topic.dat
-share/gnome/help/gnomecard/C/description.html
-share/gnome/help/gnomecard/C/dialogs.html
-share/gnome/help/gnomecard/C/display.html
-share/gnome/help/gnomecard/C/docbook.css
-share/gnome/help/gnomecard/C/index.html
-share/gnome/help/gnomecard/C/menubar.html
-share/gnome/help/gnomecard/C/recordview.html
-share/gnome/help/gnomecard/C/toolbar.html
-share/gnome/help/gnomecard/C/topic.dat
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
 share/locale/cs/LC_MESSAGES/gnome-pim.mo
@@ -24,13 +15,13 @@ share/locale/es/LC_MESSAGES/gnome-pim.mo
 share/locale/fi/LC_MESSAGES/gnome-pim.mo
 share/locale/fr/LC_MESSAGES/gnome-pim.mo
 share/locale/ga/LC_MESSAGES/gnome-pim.mo
+share/locale/hu/LC_MESSAGES/gnome-pim.mo
 share/locale/it/LC_MESSAGES/gnome-pim.mo
 share/locale/ja/LC_MESSAGES/gnome-pim.mo
 share/locale/ko/LC_MESSAGES/gnome-pim.mo
 share/locale/no/LC_MESSAGES/gnome-pim.mo
 share/locale/pt/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
+share/locale/ru/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/cal/C
 @dirrm share/gnome/help/cal
-@dirrm share/gnome/help/gnomecard/C
-@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index afa832d7eb62..638052b77150 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/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/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 32cec07ed8c2..b35b2a17cd4c 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583
+MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a
diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa
index 7d8da8ddc7e7..2e73d96fd7b0 100644
--- a/deskutils/gnome-utils/files/patch-aa
+++ b/deskutils/gnome-utils/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/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 61b605449a7b..43750e5c635e 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/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
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 00478acc31ba..15f0964a4172 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomepim
-# Version required:			0.99.8.1
+# Version required:			1.0.1
 # Date created:				17 Jan 1999
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1999/02/02 07:33:55 vanilla Exp $
+# $Id: Makefile,v 1.4 1999/02/19 04:30:03 vanilla Exp $
 #
 
-DISTNAME=	gnome-pim-0.99.8.1
-PKGNAME=	gnomepim-0.99.8.1
+DISTNAME=	gnome-pim-1.0.1
+PKGNAME=	gnomepim-1.0.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-pim
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	nacai@iname.com
 
@@ -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/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo
index 22af0615e6ba..fc37cd217dd7 100644
--- a/deskutils/gnomepim/distinfo
+++ b/deskutils/gnomepim/distinfo
@@ -1 +1 @@
-MD5 (gnome-pim-0.99.8.1.tar.gz) = 7abb905be1b2018e6ee5053f294b7194
+MD5 (gnome-pim-1.0.1.tar.gz) = 1f299e994a4fceb0f520bf03385510c5
diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab
index e7a8e2b3ab95..e2aad34c8ed5 100644
--- a/deskutils/gnomepim/files/patch-ab
+++ b/deskutils/gnomepim/files/patch-ab
@@ -1,7 +1,7 @@
---- gncal/Makefile.in.orig	Tue Feb  2 09:08:47 1999
-+++ gncal/Makefile.in	Tue Feb  2 09:09:32 1999
-@@ -111,11 +111,11 @@
- YACC = @YACC@
+--- gncal/Makefile.in.orig	Mon Mar  1 00:39:07 1999
++++ gncal/Makefile.in	Wed Mar  3 10:45:10 1999
+@@ -112,11 +112,11 @@
+ ZVT_LIBS = @ZVT_LIBS@
  l = @l@
  
 -help_base = $(datadir)/gnome/help/cal
@@ -14,11 +14,23 @@
  
  
  bin_PROGRAMS = gnomecal
---- gnomecard/Makefile.in.orig	Tue Feb  2 09:09:12 1999
-+++ gnomecard/Makefile.in	Tue Feb  2 09:10:02 1999
-@@ -113,11 +113,11 @@
+@@ -134,7 +134,7 @@
+ EXTRA_DIST =  	gncal.desktop		topic.dat		gnome-cal.html		bell.xpm		recur.xpm
+ 
+ 
+-Productivitydir = $(datadir)/gnome/apps/Applications
++Productivitydir = $(datadir)/apps/Applications
+ 
+ Productivity_DATA = gncal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- gnomecard/Makefile.in.orig	Mon Mar  1 00:39:10 1999
++++ gnomecard/Makefile.in	Wed Mar  3 10:45:39 1999
+@@ -112,13 +112,13 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
  
- SUBDIRS = help
+-SUBDIRS = help
++# SUBDIRS = help
  
 -xpmhelp_base = $(datadir)/gnome/help/cal
 +xpmhelp_base = $(datadir)/help/cal
@@ -30,6 +42,15 @@
  
  
  bin_PROGRAMS = gnomecard
+@@ -143,7 +143,7 @@
+ EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnomecard.desktop 	gnomecard.gnorba
+ 
+ 
+-Productivitydir = $(datadir)/gnome/apps/Applications
++Productivitydir = $(datadir)/apps/Applications
+ 
+ Productivity_DATA = gnomecard.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnomecard/help/C/Makefile.in.orig	Tue Feb  2 09:10:22 1999
 +++ gnomecard/help/C/Makefile.in	Tue Feb  2 09:10:30 1999
 @@ -112,7 +112,7 @@
@@ -41,14 +62,3 @@
  
  gnomecard_help_DATA =  	index.html			topic.dat
  
---- po/Makefile.in.in.orig	Tue Feb  2 09:11:11 1999
-+++ po/Makefile.in.in	Tue Feb  2 09:11:19 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 5ddc7de7c202..cc17d7df82f4 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -2,20 +2,11 @@ bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecard.gnorba
 lib/libversit.a
-share/gnome/apps/Productivity/gncal.desktop
-share/gnome/apps/Productivity/gnomecard.desktop
+share/gnome/apps/Applications/gncal.desktop
+share/gnome/apps/Applications/gnomecard.desktop
 share/gnome/help/cal/C/gnome-cal.html
 share/gnome/help/cal/C/index.html
 share/gnome/help/cal/C/topic.dat
-share/gnome/help/gnomecard/C/description.html
-share/gnome/help/gnomecard/C/dialogs.html
-share/gnome/help/gnomecard/C/display.html
-share/gnome/help/gnomecard/C/docbook.css
-share/gnome/help/gnomecard/C/index.html
-share/gnome/help/gnomecard/C/menubar.html
-share/gnome/help/gnomecard/C/recordview.html
-share/gnome/help/gnomecard/C/toolbar.html
-share/gnome/help/gnomecard/C/topic.dat
 share/gnome/idl/gnome-pim.idl
 share/gnome/mime-info/gnome-pim.keys
 share/locale/cs/LC_MESSAGES/gnome-pim.mo
@@ -24,13 +15,13 @@ share/locale/es/LC_MESSAGES/gnome-pim.mo
 share/locale/fi/LC_MESSAGES/gnome-pim.mo
 share/locale/fr/LC_MESSAGES/gnome-pim.mo
 share/locale/ga/LC_MESSAGES/gnome-pim.mo
+share/locale/hu/LC_MESSAGES/gnome-pim.mo
 share/locale/it/LC_MESSAGES/gnome-pim.mo
 share/locale/ja/LC_MESSAGES/gnome-pim.mo
 share/locale/ko/LC_MESSAGES/gnome-pim.mo
 share/locale/no/LC_MESSAGES/gnome-pim.mo
 share/locale/pt/LC_MESSAGES/gnome-pim.mo
 share/locale/sv/LC_MESSAGES/gnome-pim.mo
+share/locale/ru/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/cal/C
 @dirrm share/gnome/help/cal
-@dirrm share/gnome/help/gnomecard/C
-@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index afa832d7eb62..638052b77150 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/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/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 32cec07ed8c2..b35b2a17cd4c 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/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/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa
index 7d8da8ddc7e7..2e73d96fd7b0 100644
--- a/deskutils/gnomeutils2/files/patch-aa
+++ b/deskutils/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/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 61b605449a7b..43750e5c635e 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/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