14 files changed, 180 insertions, 55 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
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 193dddd7560a..fb7f7990ef69 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/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/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index ac383f616510..1eba91b4c139 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/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/gnomeutils2/pkg-descr b/deskutils/gnomeutils2/pkg-descr
index 3aaba4bf64ba..bfe154899986 100644
--- a/deskutils/gnomeutils2/pkg-descr
+++ b/deskutils/gnomeutils2/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/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index d4fbdac0ecbb..e8964ac4b6d1 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
@@ -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
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 8c9ab7c6b713..14c5d581b30f 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,9 +22,9 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20
+USE_GNOME=	gnomeprefix intlhack gnomehack gtk20
 WANT_GNOME=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 73a67c2d6c24..411e9efedee4 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gucharmap-1.2.0.tar.bz2) = 70c94bdfb13f7f47b108653237177756
-SIZE (gnome2/gucharmap-1.2.0.tar.bz2) = 1176137
+MD5 (gnome2/gucharmap-1.4.1.tar.bz2) = 8838c3171b9c7110f5d3110af5594141
+SIZE (gnome2/gucharmap-1.4.1.tar.bz2) = 1482646
diff --git a/deskutils/gucharmap/files/patch-gucharmap::gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap::gucharmap-window.c
deleted file mode 100644
index be3377f48d34..000000000000
--- a/deskutils/gucharmap/files/patch-gucharmap::gucharmap-window.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gucharmap/gucharmap-window.c.orig	Thu Nov 20 21:26:42 2003
-+++ gucharmap/gucharmap-window.c	Thu Nov 20 21:27:03 2003
-@@ -113,8 +113,8 @@
- {
-   const gchar *no_leading_space, *nptr;
-   char *endptr;
--  g_assert (direction == -1 || direction == 1);
-   gunichar wc;
-+  g_assert (direction == -1 || direction == 1);
- 
-   if (search_text[0] == '\0')
-     {
diff --git a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
new file mode 100644
index 000000000000..ce9879281483
--- /dev/null
+++ b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
@@ -0,0 +1,39 @@
+--- gucharmap/gucharmap-window.c.orig	Fri Feb 27 13:11:01 2004
++++ gucharmap/gucharmap-window.c	Wed Mar  3 22:45:21 2004
+@@ -417,8 +417,8 @@
+     {
+       GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
+       gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ()));
+-      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));;
+-      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));;
++      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));
++      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));
+     }
+ }
+ 
+@@ -430,8 +430,8 @@
+     {
+       GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
+       gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()));
+-      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));;
+-      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));;
++      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));
++      gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));
+     }
+ }
+ 
+@@ -834,12 +834,12 @@
+   g_signal_connect (priv->status, "realize", G_CALLBACK (status_realize), guw);
+ 
+   priv->progress = gtk_progress_bar_new ();
+-  gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);;
++  gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);
+ 
+ #if 0
+   grip = gtk_statusbar_new ();
+   gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (grip), TRUE);
+-  gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);;
++  gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);
+ #endif
+   gtk_widget_show_all (hbox);
+ 
diff --git a/deskutils/gucharmap/pkg-descr b/deskutils/gucharmap/pkg-descr
index 20fe556a345f..e693616630e6 100644
--- a/deskutils/gucharmap/pkg-descr
+++ b/deskutils/gucharmap/pkg-descr
@@ -1,4 +1,4 @@
-gucharmap is a Unicode/ISO10646 character map and font viewer. It uses GTK+ 
-2. It supports anti-aliased, scalable fonts.
+gucharmap is a Unicode/ISO10646 character map and font viewer.  It uses
+GTK+ 2, and supports anti-aliased, scalable fonts.
 
 WWW: http://gucharmap.sourceforge.net/
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index 921ff692b216..835800a7479a 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -1,26 +1,78 @@
 bin/charmap
-@unexec if test -L %D/bin/gnome-character-map; then rm -f %D/bin/gnome-character-map; fi
+bin/gnome-character-map
 bin/gucharmap
+include/gucharmap/gucharmap-block-chapters.h
+include/gucharmap/gucharmap-chapters.h
 include/gucharmap/gucharmap-charmap.h
+include/gucharmap/gucharmap-codepoint-list.h
 include/gucharmap/gucharmap-mini-fontsel.h
+include/gucharmap/gucharmap-script-chapters.h
+include/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap/gucharmap-search-dialog.h
 include/gucharmap/gucharmap-table.h
 include/gucharmap/gucharmap-unicode-info.h
 include/gucharmap/gucharmap-window.h
 include/gucharmap/gucharmap.h
-lib/gtk-2.0/2.2.0/immodules/im-gucharmap.so
 lib/libgucharmap.a
 lib/libgucharmap.so
-lib/libgucharmap.so.3
+lib/libgucharmap.so.4
 libdata/pkgconfig/gucharmap.pc
 share/gnome/applications/gucharmap.desktop
 share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/C/figures/gucharmap_window.png
 share/gnome/help/gucharmap/C/gucharmap.xml
 share/gnome/help/gucharmap/C/legal.xml
+share/gnome/help/gucharmap/de/figures/gucharmap_window.png
+share/gnome/help/gucharmap/de/gucharmap.xml
+share/gnome/help/gucharmap/de/legal.xml
+share/gnome/help/gucharmap/es/figures/gucharmap_window.png
+share/gnome/help/gucharmap/es/gucharmap.xml
+share/gnome/help/gucharmap/es/legal.xml
+share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
+share/gnome/help/gucharmap/fr/gucharmap.xml
+share/gnome/help/gucharmap/fr/legal.xml
+share/gnome/help/gucharmap/it/figures/gucharmap_window.png
+share/gnome/help/gucharmap/it/gucharmap.xml
+share/gnome/help/gucharmap/it/legal.xml
+share/gnome/help/gucharmap/ja/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ja/gucharmap.xml
+share/gnome/help/gucharmap/ja/legal.xml
+share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ko/gucharmap.xml
+share/gnome/help/gucharmap/ko/legal.xml
+share/gnome/help/gucharmap/sv/figures/gucharmap_window.png
+share/gnome/help/gucharmap/sv/gucharmap.xml
+share/gnome/help/gucharmap/sv/legal.xml
+share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_CN/gucharmap.xml
+share/gnome/help/gucharmap/zh_CN/legal.xml
+share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_TW/gucharmap.xml
+share/gnome/help/gucharmap/zh_TW/legal.xml
 share/gnome/omf/gucharmap/gucharmap-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gucharmap/gucharmap-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gucharmap.png
-share/locale/az/LC_MESSAGES/gucharmap.mo
 share/locale/am/LC_MESSAGES/gucharmap.mo
+share/locale/ar/LC_MESSAGES/gucharmap.mo
+share/locale/az/LC_MESSAGES/gucharmap.mo
 share/locale/be/LC_MESSAGES/gucharmap.mo
 share/locale/bn/LC_MESSAGES/gucharmap.mo
 share/locale/ca/LC_MESSAGES/gucharmap.mo
@@ -29,6 +81,8 @@ share/locale/cy/LC_MESSAGES/gucharmap.mo
 share/locale/da/LC_MESSAGES/gucharmap.mo
 share/locale/de/LC_MESSAGES/gucharmap.mo
 share/locale/el/LC_MESSAGES/gucharmap.mo
+share/locale/en_CA/LC_MESSAGES/gucharmap.mo
+share/locale/en_GB/LC_MESSAGES/gucharmap.mo
 share/locale/eo/LC_MESSAGES/gucharmap.mo
 share/locale/es/LC_MESSAGES/gucharmap.mo
 share/locale/fa/LC_MESSAGES/gucharmap.mo
@@ -36,15 +90,22 @@ share/locale/fi/LC_MESSAGES/gucharmap.mo
 share/locale/fr/LC_MESSAGES/gucharmap.mo
 share/locale/ga/LC_MESSAGES/gucharmap.mo
 share/locale/hi/LC_MESSAGES/gucharmap.mo
+share/locale/hr/LC_MESSAGES/gucharmap.mo
 share/locale/hu/LC_MESSAGES/gucharmap.mo
+share/locale/id/LC_MESSAGES/gucharmap.mo
+share/locale/is/LC_MESSAGES/gucharmap.mo
 share/locale/it/LC_MESSAGES/gucharmap.mo
 share/locale/ja/LC_MESSAGES/gucharmap.mo
 share/locale/ko/LC_MESSAGES/gucharmap.mo
+share/locale/lt/LC_MESSAGES/gucharmap.mo
 share/locale/mk/LC_MESSAGES/gucharmap.mo
 share/locale/ml/LC_MESSAGES/gucharmap.mo
+share/locale/mn/LC_MESSAGES/gucharmap.mo
 share/locale/ms/LC_MESSAGES/gucharmap.mo
 share/locale/nl/LC_MESSAGES/gucharmap.mo
+share/locale/nn/LC_MESSAGES/gucharmap.mo
 share/locale/no/LC_MESSAGES/gucharmap.mo
+share/locale/pa/LC_MESSAGES/gucharmap.mo
 share/locale/pl/LC_MESSAGES/gucharmap.mo
 share/locale/pt/LC_MESSAGES/gucharmap.mo
 share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
@@ -55,16 +116,42 @@ share/locale/sr/LC_MESSAGES/gucharmap.mo
 share/locale/sr@Latn/LC_MESSAGES/gucharmap.mo
 share/locale/sv/LC_MESSAGES/gucharmap.mo
 share/locale/ta/LC_MESSAGES/gucharmap.mo
+share/locale/th/LC_MESSAGES/gucharmap.mo
 share/locale/uk/LC_MESSAGES/gucharmap.mo
 share/locale/vi/LC_MESSAGES/gucharmap.mo
 share/locale/wa/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
 share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/omf/gucharmap
+@dirrm share/gnome/help/gucharmap/zh_TW/figures
+@dirrm share/gnome/help/gucharmap/zh_TW
+@dirrm share/gnome/help/gucharmap/zh_CN/figures
+@dirrm share/gnome/help/gucharmap/zh_CN
+@dirrm share/gnome/help/gucharmap/sv/figures
+@dirrm share/gnome/help/gucharmap/sv
+@dirrm share/gnome/help/gucharmap/ko/figures
+@dirrm share/gnome/help/gucharmap/ko
+@dirrm share/gnome/help/gucharmap/ja/figures
+@dirrm share/gnome/help/gucharmap/ja
+@dirrm share/gnome/help/gucharmap/it/figures
+@dirrm share/gnome/help/gucharmap/it
+@dirrm share/gnome/help/gucharmap/fr/figures
+@dirrm share/gnome/help/gucharmap/fr
+@dirrm share/gnome/help/gucharmap/es/figures
+@dirrm share/gnome/help/gucharmap/es
+@dirrm share/gnome/help/gucharmap/de/figures
+@dirrm share/gnome/help/gucharmap/de
 @dirrm share/gnome/help/gucharmap/C/figures
 @dirrm share/gnome/help/gucharmap/C
 @dirrm share/gnome/help/gucharmap
 @dirrm include/gucharmap
-@exec %D/bin/gtk-query-immodules-2.0 >/dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
-@unexec %D/bin/gtk-query-immodules-2.0 >/dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gucharmap/gucharmap-zh_TW.omf 2>/dev/null || /usr/bin/true