deskutils/gnomeutils2 -> deskutils/gnome-utils

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for editors/abiword-plugins, x11/gnome2 and x11/gnome2-lite chase the rename.

PR:		ports/97985
Repocopy by:	marcus

19 files changed, 5 insertions, 505 deletions

diff --git a/MOVED b/MOVED
index 0f0aaf02f3e3..24f0d4101082 100644
--- a/MOVED
+++ b/MOVED
@@ -2309,3 +2309,4 @@ archivers/fileroller|archivers/file-roller|2006-05-27|Renamed to use real vendor
 audio/gnomeaudio2|audio/gnome-audio|2006-05-27|Renamed to use real vendor package name
 audio/gnomemedia2|audio/gnome-media|2006-05-27|Renamed to use real vendor package name
 databases/gnomedb|databases/gnome-db|2006-05-27|Renamed to use real vendor package name
+deskutils/gnomeutils2|deskutils/gnome-utils|2006-05-27|Renamed to use real vendor package name
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 1ebb4289e366..b07a95150f70 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -51,7 +51,7 @@
     SUBDIR += gnome-blog
     SUBDIR += gnome-menu-editor
     SUBDIR += gnome-pim
-    SUBDIR += gnomeutils2
+    SUBDIR += gnome-utils
     SUBDIR += gnotime
     SUBDIR += goats
     SUBDIR += gourmet
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
deleted file mode 100644
index d58281da2f51..000000000000
--- a/deskutils/gnomeutils2/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	gnomeutils2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
-#
-
-PORTNAME=	gnomeutils2
-PORTVERSION=	2.14.0
-PORTREVISION=	4
-PORTEPOCH=	1
-CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-utils-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 support utilities
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=2
-INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
-		libgnomeprintui gnomedesktop ltverhack
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
-GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
-		gnome-search-tool.schemas logview.schemas
-
-.include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
deleted file mode 100644
index 4ac628f22126..000000000000
--- a/deskutils/gnomeutils2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-utils-2.14.0.tar.bz2) = d1d16ff6bfc1f6ddc110d18ec4dfdbfa
-SHA256 (gnome2/gnome-utils-2.14.0.tar.bz2) = 44586246763c9bfb2b67baedff8c800abde0898012e646ee580ce7a4c2d57e7e
-SIZE (gnome2/gnome-utils-2.14.0.tar.bz2) = 1881962
diff --git a/deskutils/gnomeutils2/files/patch-07_fix_dict_crash_CVS b/deskutils/gnomeutils2/files/patch-07_fix_dict_crash_CVS
deleted file mode 100644
index 2fbe372c3db1..000000000000
--- a/deskutils/gnomeutils2/files/patch-07_fix_dict_crash_CVS
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -urNad gnome-utils-2.14.0~/gnome-dictionary/libgdict/Makefile.am gnome-utils-2.14.0/gnome-dictionary/libgdict/Makefile.am
---- gnome-dictionary/libgdict/Makefile.am	2006-01-12 04:39:01.000000000 +0100
-+++ gnome-dictionary/libgdict/Makefile.am	2006-05-07 12:44:29.000000000 +0200
-@@ -2,6 +2,9 @@
- 
- NULL =
- 
-+# remove comment to enable debugging
-+#GDICT_ENABLE_DEBUG=-DGDICT_ENABLE_DEBUG=1
-+
- INCLUDES = -DG_LOG_DOMAIN=\"Gdict\" 				\
- 	-DDATADIR=\""$(datadir)"\" 				\
- 	-DLIBDIR=\""$(libdir)"\" 				\
-@@ -10,6 +13,7 @@
- 	-DGNOMELOCALEDIR=\""$(gnomeutilslocaledir)"\" 		\
- 	-DGDICTSOURCESDIR=\""$(datadir)/gdict-1.0/sources"\" 	\
- 	-DGDICT_ENABLE_INTERNALS=1 				\
-+	$(GDICT_ENABLE_DEBUG)					\
- 	$(DISABLE_DEPRECATED_CFLAGS) 				\
- 	$(WARN_CFLAGS) 						\
- 	$(NULL)
-diff -urNad gnome-utils-2.14.0~/gnome-dictionary/libgdict/gdict-client-context.c gnome-utils-2.14.0/gnome-dictionary/libgdict/gdict-client-context.c
---- gnome-dictionary/libgdict/gdict-client-context.c	2006-02-11 17:55:02.000000000 +0100
-+++ gnome-dictionary/libgdict/gdict-client-context.c	2006-05-07 12:44:47.000000000 +0200
-@@ -1629,10 +1629,11 @@
- 
- /* retrieve the status code from the server response line */
- static gint
--get_status_code (const gchar *line)
-+get_status_code (const gchar *line,
-+		 gint         old_status)
- {
-   gchar *status;
--  gint retval;
-+  gint possible_status, retval;
-   
-   if (strlen (line) < 3)
-     return 0;
-@@ -1641,14 +1642,47 @@
-       !g_unichar_isdigit (line[1]) ||
-       !g_unichar_isdigit (line[2]))
-     return 0;
-+
-+  if (!g_unichar_isspace (line[3]))
-+    return 0;
-   
-   status = g_strndup (line, 3);
--  retval = atoi (status);
-+  possible_status = atoi (status);
-   g_free (status);
-+
-+  /* status whitelisting: sometimes, a database *cough* moby-thes *cough*
-+   * might return a number as first word; we do a small check here for
-+   * invalid status codes based on the previously set status; we don't check
-+   * the whole line, as we need only to be sure that the status code is
-+   * consistent with what we expect.
-+   */
-+  switch (old_status)
-+    {
-+    case GDICT_STATUS_WORD_DB_NAME:
-+      if (possible_status == GDICT_STATUS_OK)
-+	retval = possible_status;
-+      else
-+        retval = 0;
-+      break;
-+    case GDICT_STATUS_N_DEFINITIONS_RETRIEVED:
-+      if (possible_status == GDICT_STATUS_WORD_DB_NAME)
-+	retval = possible_status;
-+      else
-+	retval = 0;
-+      break;
-+    case GDICT_STATUS_N_MATCHES_FOUND:
-+      if (possible_status == GDICT_STATUS_OK)
-+	retval = possible_status;
-+      else
-+	retval = 0;
-+      break;
-+    default:
-+      retval = possible_status;
-+      break;
-+    }
-   
-   return retval;
- }  
--  
- 
- static gboolean
- gdict_client_context_io_watch_cb (GIOChannel         *channel,
-@@ -1735,7 +1769,7 @@
-       /* truncate the line terminator before parsing */
-       line[term] = '\0';
-       
--      status_code = get_status_code (line);
-+      status_code = get_status_code (line, priv->status_code);
-       if ((status_code == 0) || (GDICT_IS_VALID_STATUS_CODE (status_code)))
-         {
-           priv->status_code = status_code;
diff --git a/deskutils/gnomeutils2/files/patch-ai b/deskutils/gnomeutils2/files/patch-ai
deleted file mode 100644
index 927a2b461d2f..000000000000
--- a/deskutils/gnomeutils2/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmldocs.make.orig	Thu Aug  7 09:56:16 2003
-+++ xmldocs.make	Thu Aug  7 13:55:58 2003
-@@ -36,7 +36,7 @@
- # **********  Begin of section some packagers may need to modify  **********
- # This variable (docdir) specifies where the documents should be installed.
- # This default value should work for most packages.
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
- 
- # **********  You should not have to edit below this line  **********
- xml_files = $(entities) $(docname).xml
diff --git a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c
deleted file mode 100644
index 0cc89594e169..000000000000
--- a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnome-screenshot/screenshot-save.c.orig	Mon Nov  1 15:56:19 2004
-+++ gnome-screenshot/screenshot-save.c	Fri Dec 17 23:11:51 2004
-@@ -94,16 +94,20 @@
-       gchar *message = NULL;
-       gchar *error_message = NULL;
-       GtkWidget *dialog;
-+      GIOStatus status;
- 
--      g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
--      message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
--      dialog = gtk_message_dialog_new (NULL, 0,
-+      status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-+      if (status == G_IO_STATUS_NORMAL)
-+        {
-+          message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
-+          dialog = gtk_message_dialog_new (NULL, 0,
- 				       GTK_MESSAGE_ERROR,
- 				       GTK_BUTTONS_OK,
- 				       message);
--      gtk_dialog_run (GTK_DIALOG (dialog));
--      gtk_widget_destroy (dialog);
--      exit (1);
-+          gtk_dialog_run (GTK_DIALOG (dialog));
-+          gtk_widget_destroy (dialog);
-+          exit (1);
-+	}
-     }
- 
-   (*save_callback) (save_user_data);
diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
deleted file mode 100644
index 9d1ee8c9c55c..000000000000
--- a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gsearchtool/gsearchtool-support.c.orig	Thu Jan  5 23:26:25 2006
-+++ gsearchtool/gsearchtool-support.c	Thu Jan  5 23:27:04 2006
-@@ -31,6 +31,7 @@
- 
- #include <glib/gi18n.h>
- #include <glib/gdate.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <gdk/gdkx.h>
- #include <libart_lgpl/art_rgb.h>
diff --git a/deskutils/gnomeutils2/files/patch-logview__logview.h b/deskutils/gnomeutils2/files/patch-logview__logview.h
deleted file mode 100644
index 3cd50f68c4bd..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview__logview.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/logview.h.orig	Wed Apr 19 12:39:07 2006
-+++ logview/logview.h	Wed Apr 19 12:40:08 2006
-@@ -73,6 +73,7 @@
- void logview_set_window_title (LogviewWindow *window);
- void logview_set_font (LogviewWindow *window, const gchar *fontname);
- void logview_show_main_content (LogviewWindow *window);
-+GType logview_window_get_type (void);
- GtkWidget *logview_window_new (void);
- 
- #endif /* __LOGVIEW_H__ */
diff --git a/deskutils/gnomeutils2/files/patch-logview_calendar.h b/deskutils/gnomeutils2/files/patch-logview_calendar.h
deleted file mode 100644
index 3aefb999f00c..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_calendar.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/calendar.h.orig	Tue Apr 18 22:20:35 2006
-+++ logview/calendar.h	Tue Apr 18 22:20:58 2006
-@@ -45,6 +45,7 @@ typedef struct CalendarClass
- 	GtkCalendarClass parent_class;
- }CalendarClass;
- 
-+GType calendar_get_type (void);
- GtkWidget *calendar_new (void);
- void calendar_select_date (Calendar *calendar, GDate *date);
- void calendar_init_data (Calendar *calendar, LogviewWindow *logview);
diff --git a/deskutils/gnomeutils2/files/patch-logview_loglist.h b/deskutils/gnomeutils2/files/patch-logview_loglist.h
deleted file mode 100644
index 149e04a59abc..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_loglist.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/loglist.h.orig	Wed Apr 19 00:30:12 2006
-+++ logview/loglist.h	Wed Apr 19 00:30:23 2006
-@@ -39,6 +39,7 @@ typedef struct LogListClass
- 	GtkTreeViewClass parent_class;
- }LogListClass;
- 
-+GType loglist_get_type (void);
- GtkWidget *loglist_new (void);
- void loglist_connect (LogList *list, LogviewWindow *window);
- void loglist_add_log (LogList *list, Log *log);
diff --git a/deskutils/gnomeutils2/files/patch-logview_logrtns.c b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
deleted file mode 100644
index 85333d2fe164..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_logrtns.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- logview/logrtns.c.orig	Wed Apr 19 00:28:00 2006
-+++ logview/logrtns.c	Wed Apr 19 00:29:24 2006
-@@ -48,7 +48,7 @@ file_exist (char *filename, gboolean sho
-    char *secondary = NULL;
- 
-    if (filename == NULL)
--       return;
-+       return FALSE;
- 
-    result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
-    if (result != GNOME_VFS_OK) {
-@@ -83,7 +83,7 @@ file_is_zipped (char *filename)
- 	char *mime_type;
- 
-     if (filename == NULL)
--        return;
-+        return FALSE;
- 
- 	mime_type = gnome_vfs_get_mime_type (filename);
-     if (mime_type == NULL)
-@@ -106,7 +106,7 @@ file_is_log (char *filename, gboolean sh
-     LogStats *stats;
- 
-     if (filename == NULL)
--        return;
-+        return FALSE;
- 
-     stats = log_stats_new (filename, show_error);
-     if (stats==NULL)
-@@ -134,11 +134,11 @@ string_get_date_string (gchar *line)
-     int i=0;
- 
-     if (line == NULL || line[0] == 0)
--        return;
-+        return NULL;
- 
-     split = g_strsplit (line, " ", 4);
-     if (split == NULL)
--        return;
-+        return NULL;
- 
-     while ((day == NULL || month == NULL) && split[i]!=NULL && i<4) {
-         if (g_str_equal (split[i], "")) {
-@@ -531,7 +531,7 @@ log_unbold (gpointer data)
-     LogList *list;
-     Log *log = data;
- 
--    g_return_if_fail (log != NULL);
-+    g_return_val_if_fail (log != NULL, FALSE);
- 
-     logview = log->window;
- 
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
deleted file mode 100644
index 1e6acd101c08..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/logview-findbar.h.orig	Wed Apr 19 00:27:03 2006
-+++ logview/logview-findbar.h	Wed Apr 19 00:27:17 2006
-@@ -44,6 +44,7 @@ typedef struct LogviewFindBarClass
- 	GtkHBoxClass parent_class;
- }LogviewFindBarClass;
- 
-+GType logview_findbar_get_type (void);
- GtkWidget *logview_findbar_new (void);
- void logview_findbar_connect (LogviewFindBar *findbar, LogviewWindow *logview);
- void logview_findbar_update_visibility (LogviewFindBar *findbar, LogviewWindow *logview);
diff --git a/deskutils/gnomeutils2/files/patch-logview_misc.c b/deskutils/gnomeutils2/files/patch-logview_misc.c
deleted file mode 100644
index 1a0f54cfe5b1..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_misc.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- logview/misc.c.orig	Tue Apr 18 21:28:07 2006
-+++ logview/misc.c	Tue Apr 18 21:28:30 2006
-@@ -135,15 +135,15 @@ string_get_date (char *line)
- {
-     GDate *date;
-     struct tm tp;
--    int cp;
-+    char *cp;
-     
-     if (line == NULL || line[0] == 0)
-         return NULL;
- 
-     cp = strptime (line, "%b %d", &tp);
--    if (cp == 0) {
-+    if (cp == NULL) {
-         cp = strptime (line, "%F", &tp);
--        if (cp == 0) {
-+        if (cp == NULL) {
-             return NULL;
-         }
-     }
diff --git a/deskutils/gnomeutils2/pkg-descr b/deskutils/gnomeutils2/pkg-descr
deleted file mode 100644
index bfe154899986..000000000000
--- a/deskutils/gnomeutils2/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-GNOME 2.0 support utilities, including a dictionary looker-upper,
-a frontend for find(1), a system log viewer, and more.
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
deleted file mode 100644
index 51eef16fbc83..000000000000
--- a/deskutils/gnomeutils2/pkg-plist
+++ /dev/null
@@ -1,197 +0,0 @@
-bin/gnome-dictionary
-bin/gnome-panel-screenshot
-bin/gnome-screenshot
-bin/gnome-search-tool
-bin/gnome-system-log
-include/gdict-1.0/gdict/gdict-client-context.h
-include/gdict-1.0/gdict/gdict-context.h
-include/gdict-1.0/gdict/gdict-defbox.h
-include/gdict-1.0/gdict/gdict-entry.h
-include/gdict-1.0/gdict/gdict-enum-types.h
-include/gdict-1.0/gdict/gdict-source-loader.h
-include/gdict-1.0/gdict/gdict-source.h
-include/gdict-1.0/gdict/gdict-utils.h
-include/gdict-1.0/gdict/gdict-version.h
-include/gdict-1.0/gdict/gdict.h
-lib/libgdict-1.0.a
-lib/libgdict-1.0.la
-lib/libgdict-1.0.so
-lib/libgdict-1.0.so.1
-libdata/bonobo/servers/GNOME_DictionaryApplet.server
-libdata/pkgconfig/gdict-1.0.pc
-libexec/gnome-dictionary-applet
-share/doc/gdict/gdict-GdictClientContext.html
-share/doc/gdict/gdict-GdictContext.html
-share/doc/gdict/gdict-GdictDefbox.html
-share/doc/gdict/gdict-GdictEntry.html
-share/doc/gdict/gdict-GdictSource.html
-share/doc/gdict/gdict-GdictSourceLoader.html
-share/doc/gdict/gdict.devhelp
-share/doc/gdict/gdict.devhelp2
-share/doc/gdict/gdict.html
-share/doc/gdict/gdictui.html
-share/doc/gdict/home.png
-share/doc/gdict/index.html
-share/doc/gdict/index.sgml
-share/doc/gdict/introduction.html
-share/doc/gdict/left.png
-share/doc/gdict/right.png
-share/doc/gdict/sources-loader.html
-share/doc/gdict/sources.html
-share/doc/gdict/style.css
-share/doc/gdict/up.png
-share/gnome/applications/gnome-dictionary.desktop
-share/gnome/applications/gnome-screenshot.desktop
-share/gnome/applications/gnome-search-tool.desktop
-share/gnome/applications/gnome-system-log.desktop
-share/gnome/gdict-1.0/sources/default.desktop
-share/gnome/gdict-1.0/sources/french.desktop
-share/gnome/gdict-1.0/sources/spanish.desktop
-share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
-share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
-share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
-share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
-share/gnome/gnome-system-log/gnome-system-log-actions.db
-share/gnome/gnome-system-log/gnome-system-log-descript.db
-share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-add-source.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-application.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-find.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-lookup.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.png
-share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
-share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/C/legal.xml
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-application.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-find.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
-share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
-share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
-share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml
-share/gnome/help/gnome-system-log/C/figures/syslog_window.png
-share/gnome/help/gnome-system-log/C/gnome-system-log.xml
-share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/help/gnome-system-log/es/figures/syslog_window.png
-share/gnome/help/gnome-system-log/es/gnome-system-log.xml
-share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-it.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
-share/gnome/pixmaps/gnome-dictionary.png
-share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
-share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrm share/gnome/pixmaps/gsearchtool
-@dirrm share/gnome/omf/gnome-system-log
-@dirrm share/gnome/omf/gnome-search-tool
-@dirrm share/gnome/omf/gnome-dictionary
-@dirrm share/gnome/help/gnome-system-log/es/figures
-@dirrm share/gnome/help/gnome-system-log/es
-@dirrm share/gnome/help/gnome-system-log/C/figures
-@dirrm share/gnome/help/gnome-system-log/C
-@dirrm share/gnome/help/gnome-system-log
-@dirrm share/gnome/help/gnome-search-tool/it/figures
-@dirrm share/gnome/help/gnome-search-tool/it
-@dirrm share/gnome/help/gnome-search-tool/es/figures
-@dirrm share/gnome/help/gnome-search-tool/es
-@dirrm share/gnome/help/gnome-search-tool/C/figures
-@dirrm share/gnome/help/gnome-search-tool/C
-@dirrm share/gnome/help/gnome-search-tool
-@dirrm share/gnome/help/gnome-dictionary/es/figures
-@dirrm share/gnome/help/gnome-dictionary/es
-@dirrm share/gnome/help/gnome-dictionary/C/figures
-@dirrm share/gnome/help/gnome-dictionary/C
-@dirrm share/gnome/help/gnome-dictionary
-@dirrm share/gnome/gnome-system-log
-@dirrm share/gnome/gnome-screenshot/glade
-@dirrm share/gnome/gnome-screenshot
-@dirrm share/gnome/gnome-dictionary
-@dirrm share/gnome/gdict-1.0/sources
-@dirrm share/gnome/gdict-1.0
-@dirrm share/doc/gdict
-@dirrm include/gdict-1.0/gdict
-@dirrm include/gdict-1.0
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 7d75e72a3c59..c3ef5a054203 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -116,7 +116,7 @@ PLIST_SUB+=		FREETRANSLATION:="@comment "
 .endif
 
 .if defined(WITH_GDICT)
-RUN_DEPENDS+=		gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2
+RUN_DEPENDS+=		gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils
 CONFIGURE_ARGS+=	--enable-gdict
 PLIST_SUB+=		GDICT:=""
 .else
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 0795b75b5c9f..1ee00d9e4a86 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
 
 RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnome-media \
-	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
+	 	gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
 		eog:${PORTSDIR}/graphics/eog \
 		gedit:${PORTSDIR}/editors/gedit \
 		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index f141e1f6f53a..c7528e7f1707 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	The "meta-port" for the GNOME 2 integrated X11 desktop
 
 RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnome-media \
-	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
+	 	gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
 		eog:${PORTSDIR}/graphics/eog \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnect:${PORTSDIR}/games/gnomegames2 \