4 files changed, 20 insertions, 14 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 193dddd7560a..fb7f7990ef69 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.6
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,10 +19,11 @@ COMMENT=	GNOME 2 support utilities
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomepanel
-USE_LIBTOOL_VER=	13
+USE_GNOME=	gnomeprefix gnomehack lthack intlhack gnomehier gnomepanel
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index ac383f616510..1eba91b4c139 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.4.1.tar.bz2) = 8512eed7ce0d291d4d8a9ddabceaa23b
-SIZE (gnome2/gnome-utils-2.4.1.tar.bz2) = 1628878
+MD5 (gnome2/gnome-utils-2.6.0.tar.bz2) = 358b2576fb07d62e5b1dc0a12eb32223
+SIZE (gnome2/gnome-utils-2.6.0.tar.bz2) = 1639773
diff --git a/deskutils/gnome-utils/pkg-descr b/deskutils/gnome-utils/pkg-descr
index 3aaba4bf64ba..bfe154899986 100644
--- a/deskutils/gnome-utils/pkg-descr
+++ b/deskutils/gnome-utils/pkg-descr
@@ -1,3 +1,2 @@
-GNOME 2.0 support utilities, including an on-the-fly dialog box tool
-(like Zenity), a dictionary, a frontend for find(1), a system log
-viewer, and more.
+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/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index d4fbdac0ecbb..e8964ac4b6d1 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -53,6 +53,9 @@ share/gnome/help/gnome-search-tool/sv/legal.xml
 share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/zh_CN/legal.xml
+share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/zh_HK/legal.xml
 share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/zh_TW/legal.xml
@@ -106,6 +109,8 @@ share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-system-log-C.omf
@@ -128,9 +133,6 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/gdict.png
-share/gnome/pixmaps/gnome-search-tool/gnome-search-tool-animation.png
-share/gnome/pixmaps/gnome-searchtool.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
@@ -154,6 +156,7 @@ share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/gl/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
@@ -168,6 +171,7 @@ share/locale/ms/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
@@ -180,13 +184,13 @@ 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/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-search-tool
 @dirrm share/gnome/help/gnome-system-log/zh_TW/figures
 @dirrm share/gnome/help/gnome-system-log/zh_TW
 @dirrm share/gnome/help/gnome-system-log/zh_CN/figures
@@ -210,6 +214,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-system-log
 @dirrm share/gnome/help/gnome-search-tool/zh_TW/figures
 @dirrm share/gnome/help/gnome-search-tool/zh_TW
+@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
+@dirrm share/gnome/help/gnome-search-tool/zh_HK
 @dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
 @dirrm share/gnome/help/gnome-search-tool/zh_CN
 @dirrm share/gnome/help/gnome-search-tool/sv/figures
@@ -251,6 +257,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-de.omf 2>/dev/null || /usr/bin/true