5 files changed, 245 insertions, 47 deletions

diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 2480f0f6c2f3..5e7764e553ea 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeutils
-PORTVERSION=	1.0.51
+PORTVERSION=	1.2.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-utils
@@ -14,9 +14,7 @@ DISTNAME=	gnome-utils-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	obgnome.1:${PORTSDIR}/lang/gnomeobjc
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -24,12 +22,9 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	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"
 
-MAN1=		gtt.1
-
 .include <bsd.port.mk>
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index a37fd502ca5b..698b6b5f0377 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome-utils-1.0.51.tar.gz) = 0de69cb5eaaf81bea3a98cc48e0266c6
+MD5 (gnome-utils-1.2.0.tar.gz) = ffee2281337d29b149612dc186299773
diff --git a/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa
index a8dc69285a9d..149087c84669 100644
--- a/misc/gnomeutils2/files/patch-aa
+++ b/misc/gnomeutils2/files/patch-aa
@@ -1,24 +1,6 @@
---- configure.orig	Wed Mar  8 09:07:49 2000
-+++ configure	Sat Mar 11 15:35:52 2000
-@@ -2480,7 +2480,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB=""
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3277,7 +3277,7 @@
-   
- 	echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6
- echo "configure:3280: 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
-@@ -5531,7 +5531,7 @@
+--- configure.orig	Fri May 19 14:49:06 2000
++++ configure	Tue May 30 13:31:24 2000
+@@ -5101,7 +5101,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -27,3 +9,32 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
+@@ -6350,17 +6350,13 @@
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   build_gfloppy=true
++  subdirs="gfloppy"
+ else
++  build_gfloppy=false
+   echo "$ac_t""no" 1>&6
+ echo "configure: warning: *** gfloppy will not be built." 1>&2
+ fi
+ 
+-if $build_gfloppy; then
+-  subdirs="gfloppy"
+-
+-fi
+-
+-
+ if test "$build_gfloppy" = true; then
+   BUILD_GFLOPPY_TRUE=
+   BUILD_GFLOPPY_FALSE='#'
+@@ -8453,7 +8449,7 @@
+     esac
+   done
+ 
+-  for ac_config_dir in gfloppy; do
++  for ac_config_dir in $subdirs ; do
+ 
+     # Do not complain, so a configure script can configure whichever
+     # parts of a large source tree are present.
diff --git a/misc/gnomeutils2/files/patch-ah b/misc/gnomeutils2/files/patch-ah
new file mode 100644
index 000000000000..ba467beaa5a6
--- /dev/null
+++ b/misc/gnomeutils2/files/patch-ah
@@ -0,0 +1,48 @@
+--- logview/actions.c.orig	Wed Apr 26 22:32:02 2000
++++ logview/actions.c	Tue May 30 13:34:05 2000
+@@ -1,6 +1,7 @@
+ #include "logview.h"
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <config.h>
+ #include <gnome.h>
+--- logview/desc_db.c.orig	Wed Apr 26 22:32:02 2000
++++ logview/desc_db.c	Tue May 30 13:34:36 2000
+@@ -1,5 +1,6 @@
+ #include "logview.h"
+ #include <string.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <stdlib.h>
+ 
+--- logview/logrtns.c.orig	Tue May 30 13:35:22 2000
++++ logview/logrtns.c	Tue May 30 13:37:45 2000
+@@ -679,7 +679,7 @@
+       if (IsLeapYear (curmark->year - lastyear + thisyear))
+ 	 curmark->time += 24 * 60 * 60;		/*  Add one day */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+       curmark->time += correction - tmptm->tm_gmtoff;
+ #else
+       curmark->time += correction - timezone;
+@@ -705,7 +705,7 @@
+    if (IsLeapYear (thisyear))
+       log->lstats.enddate += 24 * 60 * 60;	/*  Add one day */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+    log->lstats.enddate += correction - tmptm->tm_gmtoff;
+ #else
+    log->lstats.enddate += correction - timezone;
+@@ -716,7 +716,7 @@
+    if (IsLeapYear (thisyear - lastyear))
+       log->lstats.startdate += 24 * 60 * 60;	/*  Add one day */
+ 
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+    log->lstats.startdate += correction - tmptm->tm_gmtoff;
+ #else
+    log->lstats.startdate += correction - timezone;
diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist
index 2b731a213fe9..7781bd548a55 100644
--- a/misc/gnomeutils2/pkg-plist
+++ b/misc/gnomeutils2/pkg-plist
@@ -1,49 +1,122 @@
 bin/gcalc
+bin/gcharmap
 bin/gcolorsel
 bin/gdialog
+bin/gdict
 bin/gdiskfree
 bin/gfontsel
 bin/gless
-bin/gnome-run
-bin/grun
 bin/gsearchtool
 bin/gshutdown
 bin/gstripchart
 bin/gstripchart_applet
 bin/gtt
+bin/guname
 bin/gw
+bin/logview
 bin/splac
 bin/splash
+etc/CORBA/servers/gdict.gnorba
 etc/CORBA/servers/gstripchart_applet.gnorba
 share/gnome/applets/Monitors/gstripchart_applet.desktop
+share/gnome/applets/Utility/gdict.desktop
 share/gnome/apps/Applications/gtt.desktop
+share/gnome/apps/System/gdiskfree.desktop
 share/gnome/apps/System/gshutdown.desktop
+share/gnome/apps/System/guname.desktop
+share/gnome/apps/System/gw.desktop
+share/gnome/apps/System/logview.desktop
+share/gnome/apps/Utilities/GDict.desktop
 share/gnome/apps/Utilities/gcalc.desktop
+share/gnome/apps/Utilities/gcharmap.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
 share/gnome/apps/Utilities/gstripchart.desktop
-share/gnome/apps/Utilities/gw.desktop
-share/gnome/apps/gnome-run.desktop
+share/gnome/gcolorsel/glade/dialog-new-doc.glade
+share/gnome/gcolorsel/glade/dialog-new-doc.glade.h
+share/gnome/gcolorsel/glade/dialog-new-view.glade
+share/gnome/gcolorsel/glade/dialog-new-view.glade.h
+share/gnome/gcolorsel/glade/dialog-prefs.glade
+share/gnome/gcolorsel/glade/dialog-prefs.glade.h
+share/gnome/gcolorsel/glade/mdi-color-file-properties.glade
+share/gnome/gcolorsel/glade/mdi-color-file-properties.glade.h
+share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade
+share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade.h
+share/gnome/gcolorsel/glade/view-color-edit.glade
+share/gnome/gcolorsel/glade/view-color-edit.glade.h
+share/gnome/gcolorsel/glade/view-color-generic-properties.glade
+share/gnome/gcolorsel/glade/view-color-generic-properties.glade.h
+share/gnome/gcolorsel/glade/view-color-grid-properties.glade
+share/gnome/gcolorsel/glade/view-color-grid-properties.glade.h
+share/gnome/gcolorsel/glade/view-color-list-properties.glade
+share/gnome/gcolorsel/glade/view-color-list-properties.glade.h
 share/gnome/gstripchart/gstripchart.conf
+share/gnome/help/gcharmap/C/authors.html
+share/gnome/help/gcharmap/C/bugs.html
+share/gnome/help/gcharmap/C/docbook.css
+share/gnome/help/gcharmap/C/images/gcharmap.png
+share/gnome/help/gcharmap/C/images/gcharmap_insertascii.png
+share/gnome/help/gcharmap/C/index.html
+share/gnome/help/gcharmap/C/license.html
+share/gnome/help/gcharmap/C/ln7.html
+share/gnome/help/gcharmap/C/topic.dat
+share/gnome/help/gcharmap/C/usage.html
+share/gnome/help/gcolorsel/C/authors.html
+share/gnome/help/gcolorsel/C/bugs.html
+share/gnome/help/gcolorsel/C/docbook.css
+share/gnome/help/gcolorsel/C/favorites.png
+share/gnome/help/gcolorsel/C/index.html
+share/gnome/help/gcolorsel/C/license.html
+share/gnome/help/gcolorsel/C/ln7.html
+share/gnome/help/gcolorsel/C/menus.html
+share/gnome/help/gcolorsel/C/properties.html
+share/gnome/help/gcolorsel/C/search.html
+share/gnome/help/gcolorsel/C/search.png
+share/gnome/help/gcolorsel/C/simple.html
+share/gnome/help/gcolorsel/C/simple.png
+share/gnome/help/gcolorsel/C/topic.dat
+share/gnome/help/gcolorsel/C/usage.html
+share/gnome/help/gcolorsel/C/xcolors.html
+share/gnome/help/gdict/C/authors.html
+share/gnome/help/gdict/C/docbook.css
+share/gnome/help/gdict/C/gdict-prefs.png
+share/gnome/help/gdict/C/gdict-spell.png
+share/gnome/help/gdict/C/gdictmain.png
+share/gnome/help/gdict/C/index.html
+share/gnome/help/gdict/C/license.html
+share/gnome/help/gdict/C/ln7.html
+share/gnome/help/gdict/C/prefs.html
+share/gnome/help/gdict/C/topic.dat
+share/gnome/help/gdict/C/usage.html
 share/gnome/help/gdiskfree/C/authors.html
 share/gnome/help/gdiskfree/C/docbook.css
 share/gnome/help/gdiskfree/C/images/gdiskfree.png
+share/gnome/help/gdiskfree/C/images/gdiskfree-prefs.png
 share/gnome/help/gdiskfree/C/index.html
+share/gnome/help/gdiskfree/C/ln7.html
+share/gnome/help/gdiskfree/C/prefs.html
 share/gnome/help/gdiskfree/C/topic.dat
 share/gnome/help/gdiskfree/C/usage.html
 share/gnome/help/gfontsel/C/authors.html
 share/gnome/help/gfontsel/C/filter.html
+share/gnome/help/gfontsel/C/filterwin.png
 share/gnome/help/gfontsel/C/fontinfo.html
 share/gnome/help/gfontsel/C/index.html
+share/gnome/help/gfontsel/C/license.html
 share/gnome/help/gfontsel/C/ln7.html
 share/gnome/help/gfontsel/C/mainshot.png
 share/gnome/help/gfontsel/C/mainwin.html
 share/gnome/help/gfontsel/C/stylesheet-images/warning.gif
 share/gnome/help/gfontsel/C/topic.dat
 share/gnome/help/gfontsel/C/xlfd.html
+share/gnome/help/gless/C/authors.html
+share/gnome/help/gless/C/docbook.css
+share/gnome/help/gless/C/gless-main.png
+share/gnome/help/gless/C/index.html
+share/gnome/help/gless/C/topic.dat
+share/gnome/help/gless/C/usage.html
 share/gnome/help/gsearchtool/C/authors.html
 share/gnome/help/gsearchtool/C/criteria.html
 share/gnome/help/gsearchtool/C/gsearch.png
@@ -55,26 +128,67 @@ share/gnome/help/gsearchtool/C/mainwin.png
 share/gnome/help/gsearchtool/C/results.png
 share/gnome/help/gsearchtool/C/topic.dat
 share/gnome/help/gsearchtool/C/usage.html
+share/gnome/help/gshutdown/C/authors.html
+share/gnome/help/gshutdown/C/docbook.css
+share/gnome/help/gshutdown/C/gshutdown-advanced.png
+share/gnome/help/gshutdown/C/gshutdown-preferences.png
+share/gnome/help/gshutdown/C/gshutdown.png
 share/gnome/help/gshutdown/C/index.html
 share/gnome/help/gshutdown/C/topic.dat
-share/gnome/help/gshutdown/es/index.html
-share/gnome/help/gshutdown/es/topic.dat
-share/gnome/help/gshutdown/no/index.html
-share/gnome/help/gshutdown/no/topic.dat
+share/gnome/help/gshutdown/C/usage.html
+share/gnome/help/gstripchart/C/authors.html
+share/gnome/help/gstripchart/C/bugs.html
+share/gnome/help/gstripchart/C/docbook.css
 share/gnome/help/gstripchart/C/index.html
+share/gnome/help/gstripchart/C/license.html
+share/gnome/help/gstripchart/C/ln7.html
+share/gnome/help/gstripchart/C/prefs.html
 share/gnome/help/gstripchart/C/topic.dat
+share/gnome/help/gstripchart/C/usage.html
+share/gnome/help/gtt/C/authors.html
+share/gnome/help/gtt/C/bugs.html
+share/gnome/help/gtt/C/dialogs.html
+share/gnome/help/gtt/C/docbook.css
+share/gnome/help/gtt/C/gtt_mainwin.png
+share/gnome/help/gtt/C/gtt_prefswin.png
 share/gnome/help/gtt/C/index.html
+share/gnome/help/gtt/C/license.html
+share/gnome/help/gtt/C/ln10.html
+share/gnome/help/gtt/C/preferences.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/help/gtt/C/usage.html
+share/gnome/help/guname/C/authors.html
+share/gnome/help/guname/C/docbook.css
+share/gnome/help/guname/C/guname-cpuinfo.png
+share/gnome/help/guname/C/guname-diskinfo.png
+share/gnome/help/guname/C/guname-main.png
+share/gnome/help/guname/C/guname-memoryinfo.png
+share/gnome/help/guname/C/index.html
+share/gnome/help/guname/C/license.html
+share/gnome/help/guname/C/topic.dat
+share/gnome/help/guname/C/usage.html
+share/gnome/help/gw/C/authors.html
+share/gnome/help/gw/C/bugs.html
+share/gnome/help/gw/C/docbook.css
+share/gnome/help/gw/C/gw-main.png
+share/gnome/help/gw/C/gw-menuitems.png
+share/gnome/help/gw/C/index.html
+share/gnome/help/gw/C/license.html
+share/gnome/help/gw/C/ln7.html
+share/gnome/help/gw/C/prefs.html
+share/gnome/help/gw/C/topic.dat
+share/gnome/help/gw/C/usage.html
 share/gnome/idl/gsu.idl
+share/gnome/logview/logview-actions.db
+share/gnome/logview/logview-descript.db
+share/gnome/logview/logview-regexp.db
+share/gnome/pixmaps/gdict.png
 share/gnome/pixmaps/gnome-fontsel.png
 share/gnome/pixmaps/gnome-searchtool.png
 share/gnome/pixmaps/gnome-shutdown.png
 share/gnome/pixmaps/gnome-stripchart.png
 share/gnome/pixmaps/gnome-who.png
+share/gnome/pixmaps/logview/logview.xpm
 share/locale/ca/LC_MESSAGES/gnome-utils.mo
 share/locale/cs/LC_MESSAGES/gnome-utils.mo
 share/locale/da/LC_MESSAGES/gnome-utils.mo
@@ -86,36 +200,66 @@ share/locale/et/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/gl/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/lt/LC_MESSAGES/gnome-utils.mo
+share/locale/nl/LC_MESSAGES/gnome-utils.mo
 share/locale/no/LC_MESSAGES/gnome-utils.mo
 share/locale/pl/LC_MESSAGES/gnome-utils.mo
 share/locale/pt/LC_MESSAGES/gnome-utils.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-utils.mo
+share/locale/ro/LC_MESSAGES/gnome-utils.mo
 share/locale/ru/LC_MESSAGES/gnome-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-utils.mo
+share/locale/tr/LC_MESSAGES/gnome-utils.mo
 share/locale/uk/LC_MESSAGES/gnome-utils.mo
 share/locale/wa/LC_MESSAGES/gnome-utils.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
-@dirrm share/gnome/help/gtt/es
-@dirrm share/gnome/help/gtt/de
+@dirrm share/gnome/pixmaps/logview
+@dirrm share/gnome/logview
+@dirrm share/gnome/help/gw/C/images
+@dirrm share/gnome/help/gw/C
+@dirrm share/gnome/help/gw
+@dirrm share/gnome/help/guname/C/images
+@dirrm share/gnome/help/guname/C
+@dirrm share/gnome/help/guname
+@dirrm share/gnome/help/gtt/C/stylesheet-images
+@dirrm share/gnome/help/gtt/C/images
 @dirrm share/gnome/help/gtt/C
 @dirrm share/gnome/help/gtt
+@dirrm share/gnome/help/gstripchart/C/stylesheet-images
+@dirrm share/gnome/help/gstripchart/C/images
 @dirrm share/gnome/help/gstripchart/C
 @dirrm share/gnome/help/gstripchart
-@dirrm share/gnome/help/gshutdown/no
-@dirrm share/gnome/help/gshutdown/es
+@dirrm share/gnome/help/gshutdown/C/images
 @dirrm share/gnome/help/gshutdown/C
 @dirrm share/gnome/help/gshutdown
 @dirrm share/gnome/help/gsearchtool/C
 @dirrm share/gnome/help/gsearchtool
+@dirrm share/gnome/help/gless/C/images
+@dirrm share/gnome/help/gless/C
+@dirrm share/gnome/help/gless
 @dirrm share/gnome/help/gfontsel/C/stylesheet-images
 @dirrm share/gnome/help/gfontsel/C
 @dirrm share/gnome/help/gfontsel
+@dirrm share/gnome/help/gdiskfree/C/stylesheet-images
 @dirrm share/gnome/help/gdiskfree/C/images
 @dirrm share/gnome/help/gdiskfree/C
 @dirrm share/gnome/help/gdiskfree
+@dirrm share/gnome/help/gdict/C/images
+@dirrm share/gnome/help/gdict/C
+@dirrm share/gnome/help/gdict
+@dirrm share/gnome/help/gcolorsel/C/stylesheet-images
+@dirrm share/gnome/help/gcolorsel/C
+@dirrm share/gnome/help/gcolorsel
+@dirrm share/gnome/help/gcharmap/C/stylesheet-images
+@dirrm share/gnome/help/gcharmap/C/images
+@dirrm share/gnome/help/gcharmap/C
+@dirrm share/gnome/help/gcharmap
 @dirrm share/gnome/gstripchart
+@dirrm share/gnome/gcolorsel/glade
+@dirrm share/gnome/gcolorsel