4 files changed, 29 insertions, 71 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 418b9366511f..17d656f8bb1f 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.12 2005/10/29 22:31:15 marcus Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.24 2006/04/13 07:52:31 bland Exp $
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	1.4.4
-PORTREVISION=	3
+PORTVERSION=	1.6.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,6 +21,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils
@@ -29,6 +29,7 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
+INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index a54d6076786b..d5508f6a1ed8 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.4.4.tar.bz2) = c9741329d08908a271864664c3f2e91c
-SHA256 (gnome2/gucharmap-1.4.4.tar.bz2) = 17a1776d1f9b3c481601fc7b33cee38665c384b07b0b3224ae91e7c0c6ba6e23
-SIZE (gnome2/gucharmap-1.4.4.tar.bz2) = 1450271
+MD5 (gnome2/gucharmap-1.6.0.tar.bz2) = 8af03f350c988d1565922b10776bc725
+SHA256 (gnome2/gucharmap-1.6.0.tar.bz2) = b27f201b58ec077ebe6f97ffc040c9f1e171b9595d5a917052345f711c6d2107
+SIZE (gnome2/gucharmap-1.6.0.tar.bz2) = 2131883
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 c0abeb262374..000000000000
--- a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- gucharmap/gucharmap-window.c.orig	Mon Jan 24 05:56:53 2005
-+++ gucharmap/gucharmap-window.c	Sat Sep 17 04:04:07 2005
-@@ -82,6 +82,8 @@
-   ChaptersMode chapters_mode; 
- };
- 
-+static GtkWindowClass *parent_class = NULL;
-+
- static void
- status_message (GtkWidget       *widget, 
-                 const gchar     *message, 
-@@ -417,8 +419,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 +432,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 +836,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);
- 
-@@ -886,11 +888,13 @@
-     g_free (priv->last_search);
-     */
- #endif
-+  G_OBJECT_CLASS (parent_class)->finalize (object);
- }
- 
- static void
- gucharmap_window_class_init (GucharmapWindowClass *clazz)
- {
-+  parent_class = g_type_class_peek_parent (clazz);
-   GTK_WIDGET_CLASS (clazz)->show_all = show_all;
-   G_OBJECT_CLASS (clazz)->finalize = window_finalize;
-   g_type_class_add_private (clazz, sizeof (GucharmapWindowPrivate));
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index 69c6052950f8..a8039b55ab82 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -18,14 +18,22 @@ lib/libgucharmap.so
 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/bg/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
+share/gnome/help/gucharmap/bg/gucharmap.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_start_window.png
 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/fi/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/fi/figures/gucharmap_window.png
+share/gnome/help/gucharmap/fi/gucharmap.xml
 share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
 share/gnome/help/gucharmap/fr/gucharmap.xml
 share/gnome/help/gucharmap/fr/legal.xml
@@ -48,8 +56,10 @@ 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
+share/gnome/omf/gucharmap/gucharmap-bg.omf
 share/gnome/omf/gucharmap/gucharmap-de.omf
 share/gnome/omf/gucharmap/gucharmap-es.omf
+share/gnome/omf/gucharmap/gucharmap-fi.omf
 share/gnome/omf/gucharmap/gucharmap-fr.omf
 share/gnome/omf/gucharmap/gucharmap-it.omf
 share/gnome/omf/gucharmap/gucharmap-ja.omf
@@ -57,7 +67,7 @@ share/gnome/omf/gucharmap/gucharmap-ko.omf
 share/gnome/omf/gucharmap/gucharmap-sv.omf
 share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
 share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
-share/gnome/pixmaps/gucharmap.png
+share/icons/hicolor/48x48/apps/gucharmap.png
 share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
 share/locale/az/LC_MESSAGES/gucharmap.mo
@@ -76,6 +86,7 @@ share/locale/en_GB/LC_MESSAGES/gucharmap.mo
 share/locale/eo/LC_MESSAGES/gucharmap.mo
 share/locale/es/LC_MESSAGES/gucharmap.mo
 share/locale/et/LC_MESSAGES/gucharmap.mo
+share/locale/eu/LC_MESSAGES/gucharmap.mo
 share/locale/fa/LC_MESSAGES/gucharmap.mo
 share/locale/fi/LC_MESSAGES/gucharmap.mo
 share/locale/fr/LC_MESSAGES/gucharmap.mo
@@ -121,7 +132,10 @@ share/locale/vi/LC_MESSAGES/gucharmap.mo
 share/locale/wa/LC_MESSAGES/gucharmap.mo
 share/locale/xh/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
+share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
 share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/omf/gucharmap
 @dirrm share/gnome/help/gucharmap/zh_TW/figures
 @dirrm share/gnome/help/gucharmap/zh_TW
@@ -137,10 +151,15 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/help/gucharmap/it
 @dirrm share/gnome/help/gucharmap/fr/figures
 @dirrm share/gnome/help/gucharmap/fr
+@dirrm share/gnome/help/gucharmap/fi/figures
+@dirrm share/gnome/help/gucharmap/fi
 @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/bg/figures
+@dirrm share/gnome/help/gucharmap/bg
+@dirrm share/gnome/help/gucharmap/C/figures
 @dirrm share/gnome/help/gucharmap/C
 @dirrm share/gnome/help/gucharmap
 @dirrm include/gucharmap