Update to 2.6.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2151 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 26 insertions, 8 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index f4b7d8243..bff8596fc 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.5.90
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.5
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.6
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 27d428288..1eba91b4c 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.5.90.tar.bz2) = bd7e193525cf2053b3588328cbe855ed
-SIZE (gnome2/gnome-utils-2.5.90.tar.bz2) = 1668645
+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-plist b/deskutils/gnome-utils/pkg-plist
index 174e7edd3..e8964ac4b 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
@@ -166,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
@@ -208,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
@@ -249,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
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index f4b7d8243..bff8596fc 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.5.90
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.5
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.6
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 27d428288..1eba91b4c 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.5.90.tar.bz2) = bd7e193525cf2053b3588328cbe855ed
-SIZE (gnome2/gnome-utils-2.5.90.tar.bz2) = 1668645
+MD5 (gnome2/gnome-utils-2.6.0.tar.bz2) = 358b2576fb07d62e5b1dc0a12eb32223
+SIZE (gnome2/gnome-utils-2.6.0.tar.bz2) = 1639773
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 174e7edd3..e8964ac4b 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/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
@@ -166,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
@@ -208,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
@@ -249,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