Update kasumi to 2.5.

2009-07-29  Takuro Ashie <ashie@clear-code.com>

	* preparation for release (ver 2.5)

2009-07-21  Takuro Ashie <ashie@clear-code.com>

	* fix:
	  - Fix paddings in the KasumiAddWindow.

2009-07-16  Takuro Ashie <ashie@clear-code.com>

	* fix:
	  - Use stock objects for buttons on KasumiAddWindow.
	  - Remove neeldless key accelerators for KasumiAddWindow.

2009-07-16  Takuro Ashie <ashie@clear-code.com>

	* fix:
	  - Fix paddings in the main window.
	  - Fix minimum size of columns in the word list view.
	  - Remove needless key accelerators in main window.
	    Use mnemonic instead.
	  - Remove some needless codes.

2009-07-13  Takuro Ashie <ashie@clear-code.com>

	* fix:
	  - Fix a compile time warning.
	  - Rename some strang variable names.

2009-07-13  Takuro Ashie <ashie@clear-code.com>

	* enhancement:
	  - Added some word type subcategories. Thanks to Jun Oizumi.

2009-06-25  Takuro Ashie <ashie@clear-code.com>

	* fix
	  - Kill duplicated Ikuya Awashiro in man page! Thanks to Jun Oizumi.

2009-06-25  Takuro Ashie <ashie@clear-code.com>

	* fix
 	  - Remove "SIKU" conjugation. Thanks to Jun Oizumi.

2009-01-29  Takuro Ashie <ashie@clear-code.com>

	* preparation for release (ver 2.4)

2009-01-20  Ikuya Awashiro <ikuya@fruitsbasket.info>

	* KasumiAddWindow.cxx:
	 - addded an include file. Thanks to Mike Fabian.
	* KasumiWord.cxx:
	 - DITTO.
	* main.cxx:
	 - DITTO.

2009-01-20  Takuro Ashie <ashie@clear-code.com>

	* enhancement:
	 - Support ANTHY_UTF8_ENCODING and set it as default.
	   You can switch to ANTHY_EUC_JP_ENCODING by -E or --eucjp option.

2007-10-30  Ikuya Awashiro <ikuya@fruitsbasket.info>
	* fix:
	 - FTBFS with GCC 4.3: missing #includes
	   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417266
	   Thaks to Martin Michlmayr <tbm@cyrius.com>.
	 - kasumi dumps core on x86_64 systems when trying
	   to add new words to the dictionary
	   https://bugzilla.novell.com/show_bug.cgi?id=253788
	   Thanks to Mike Fabian.
	 - fail in the judgment of the version.
	   http://kasumi.sourceforge.jp/index.php?%A5%D0%A5%B0%CA%F3%B9%F0%2F95
	   Thanks to dtana.
	* preparation for release (ver 2.3)

2006-11-29  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* preparation for release (ver 2.2)

2006-11-28  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* enhancement:
	 - change the text color on the search entry box if Kasumi failed
	   to find specified text
	 - ask Gtk+ library to keep above the exclusive mode window

	* fix:
	 - scroll to the undermost of the view after adding a new word

2006-11-27  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix:
	 - the bug raised while sorting

2006-10-15  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* enhancement:
	 - add exclusive mode

2006-10-14  Ikuya Awashiro <ikuya@fruitsbasket.info>
	* configure.in: 2.1
	* This release is a result at the CodeFest Kyoto 2006
	  hosted by FSIJ.

2006-10-14  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* enhancement:
	 - add new word type category combo box

	* fix:
	 - export embedded string to po files
	 - changed adding window title
	 - remove unnecessary words
	 - improve portability
	 - support dakuon mark

2006-06-28  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: AUTHORS
	 - reconstruction of AUTHORS file
	 - added Italian l10n team

2006-06-26  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: KasumiException.cxx
	 - security fix

	* fix: KasumiDicEventListener.hxx KasumiWordEventListener.hxx
	 - add virtual destructor to avoid compilation warnings

	* fix: configure.in main.cxx Makefile.am acconfig.h
	 - removed acconfig.h deprecated in autoconf 2.5
	 - correctly handling "--disable-nls" option on no-glibc platform
	 - thanks to Diego's patch

	* fix: AUTHORS
	 - typo of my email address :(

2006-06-25  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: KasumiAddWindow.cxx po/*.po po/*.pot
	 - fixed typo: "Invlid" -> "Invalid"

	* New feature:
	 - Italian localization

2006-06-23  Ikuya Awashiro <ikuya@fruitsbasket.info>
	* KasumiMainWindow.hxx:
	 - fixed compile error on gcc 4.1. thanks to sgtom.

2006-06-21  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: configure.in
	 - require Gtk+ version is 2.6 or higher for GtkCellRendererCombo

2006-06-20  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: KasumiDic.cxx
	 - fix the defect that Kasumi failes when the private dictionary
	   doesn't have any word.

2006-06-03  Ikuya Awashiro <ikuya@fruitsbasket.info>
	* kasumi.desktop.in:
	 - added.
	* Makefile.am, configure.in:
	 - resistered in GNOME/K menu.

2006-06-02  Ikuya Awashiro <ikuya@fruitsbasket.info>
	* Makefile.am:
	 - kasumi.png was placed in /usr/share/pixmaps instead /usr/share/kasumi.
	 - add man page.
	* kasumi.1:
	 - added.

2006-05-29  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

 	* preparation for release (ver 2.0)

	* fix: KasumiWord.cxx, configure.in
	 - accept ASCII character in sound entries

	* fix: AUTHORS
	 - add Ikuya to AUTHORS

	* fix: POTFILES.in ja.po
	 - translated newly created message

	* enhancement: KasumiMainWindow.cxx KasumiMainWindow.hxx
	 - obsolete "Add Mode" button

2006-05-28  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: main.cxx
	 - changed copyright notice

	* fix: KasumiWordType.hxx, KasumiWord.cxx
	 - don't issue modification event when the same value are set

2006-05-27  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: KasumiDic.cxx, KasumiWordType.cxx
	 - set an alternative word type if specified one does not exist
	 - measures against an anthy's defect that it returns error code
	   even when it is right and no word is registered.

	* fix:
	 - inserted copyright and license terms into the head of each
	   source file or header file.

	* fix: KasumiAddWindow.cxx
	 - changed the page size of the spin button

2006-05-17  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix: KasumiDic.cxx
	 - change the condition of anthy version

2006-05-14  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* fix
	 - KasumiAddWindow
	 - search function for KasumiMainWindow

	* enhancement
	 - implement of KasumiWordEventListener

2006-05-7  Takashi Nakamoto  <bluedwarf@bpost.plala.or.jp>

	* drastic changes for new version 2.0

2006-03-26  Ikuya Awashiro <ikuya@fruitsbasket.info>
	* KasumiMainWindow.hxx, KasumiAddWindow.hxx:
	Fixed with G++ 4.1: friends not declared
	Thanks to Martin Michlmayr <tbm@cyrius.com>

6 files changed, 16 insertions, 98 deletions

diff --git a/inputmethod/kasumi/Makefile b/inputmethod/kasumi/Makefile
index 1278e06a6e6..b1edcc70b56 100644
--- a/inputmethod/kasumi/Makefile
+++ b/inputmethod/kasumi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/08 13:26:23 obache Exp $
 
-DISTNAME=	kasumi-1.0.1
-PKGREVISION=	1
+DISTNAME=	kasumi-2.5
 CATEGORIES=	inputmethod japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kasumi/20685/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kasumi/41436/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kasumi.sourceforge.jp/
@@ -15,14 +14,14 @@ USE_TOOLS+=	pkg-config
 USE_X11=	yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=	yes
-
-USE_LANGUAGES+=	c c++
+USE_LANGUAGES=	c c++
 
 BUILDLINK_API_DEPENDS.anthy+=	anthy>=6520
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6
 
 .include "../../inputmethod/anthy/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/kasumi/PLIST b/inputmethod/kasumi/PLIST
index 5dea001137e..83239df1b23 100644
--- a/inputmethod/kasumi/PLIST
+++ b/inputmethod/kasumi/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:01:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/05/08 13:26:23 obache Exp $
 bin/kasumi
-share/kasumi/kasumi.png
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/kasumi.mo
+man/man1/kasumi.1
+share/applications/kasumi.desktop
+share/locale/it/LC_MESSAGES/kasumi.mo
+share/locale/ja/LC_MESSAGES/kasumi.mo
+share/pixmaps/kasumi.png
diff --git a/inputmethod/kasumi/distinfo b/inputmethod/kasumi/distinfo
index d8486ebdfc4..4701f45f090 100644
--- a/inputmethod/kasumi/distinfo
+++ b/inputmethod/kasumi/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/01/13 13:02:54 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/05/08 13:26:23 obache Exp $
 
-SHA1 (kasumi-1.0.1.tar.gz) = 8cd7d5d9b91875a7dea5450fcdfdcbabdd1d52ce
-RMD160 (kasumi-1.0.1.tar.gz) = 2c49afa2b6c0de63d303cefdfd71457c394cf950
-Size (kasumi-1.0.1.tar.gz) = 290336 bytes
-SHA1 (patch-aa) = e7193e682109428908d7eab6c5182a20fefc3d1b
-SHA1 (patch-ab) = ec4e7923c447faa4f72b77ca9087d3e4777585e1
-SHA1 (patch-ac) = 151e00c3d326cd9c1778c5454baa700a5cf58a8c
+SHA1 (kasumi-2.5.tar.gz) = 38155494d684f61e74ed1498ec90cc0fc68d791a
+RMD160 (kasumi-2.5.tar.gz) = b609988d585b387acf83f5e7f6f58d6b10c80dd3
+Size (kasumi-2.5.tar.gz) = 279587 bytes
diff --git a/inputmethod/kasumi/patches/patch-aa b/inputmethod/kasumi/patches/patch-aa
deleted file mode 100644
index 821ec636ef6..00000000000
--- a/inputmethod/kasumi/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/01/13 13:02:54 joerg Exp $
-
---- KasumiWord.cxx.orig	2005-09-01 08:01:45.000000000 +0000
-+++ KasumiWord.cxx
-@@ -17,24 +17,28 @@ iconv_t KasumiWord::IconvEUCJP_To_UTF8 =
- string KasumiWord::convertUTF8ToEUCJP(const string &aUTF8){
-   char *utf8 = (char*)malloc(strlen(aUTF8.c_str())+1);
-   strcpy(utf8, aUTF8.c_str());
-+  ICONV_CONST char *ptr_utf8 = utf8;
-   size_t len = strlen(utf8)+1;
-   size_t len_eucjp = len*2;
-   char *eucjp_buf = (char*)malloc(len_eucjp);
-   char *eucjp = eucjp_buf;
- 
--  iconv(IconvUTF8_To_EUCJP, &utf8, &len, &eucjp_buf, &len_eucjp);
-+  iconv(IconvUTF8_To_EUCJP, &ptr_utf8, &len, &eucjp_buf, &len_eucjp);
-   return string(eucjp);
- }
- 
- string KasumiWord::convertEUCJPToUTF8(const string &aEUCJP){
-   char *eucjp = (char*)malloc(strlen(aEUCJP.c_str())+1);
-   strcpy(eucjp, aEUCJP.c_str());
-+  ICONV_CONST char *ptr_eucjp = eucjp;
-+
-   size_t len = strlen(eucjp)+1;
-   size_t len_utf8 = len*2;
-   char *utf8_buf = (char*)malloc(len_utf8);
-   char *utf8 = utf8_buf;
- 
--  iconv(IconvEUCJP_To_UTF8, &eucjp, &len, &utf8_buf, &len_utf8);
-+
-+  iconv(IconvEUCJP_To_UTF8, &ptr_eucjp, &len, &utf8_buf, &len_utf8);
-   return string(utf8);
- }
- 
diff --git a/inputmethod/kasumi/patches/patch-ab b/inputmethod/kasumi/patches/patch-ab
deleted file mode 100644
index 6a065d8da32..00000000000
--- a/inputmethod/kasumi/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/07 02:00:15 obache Exp $
-
---- KasumiAddWindow.hxx.orig	2005-09-04 18:40:38.000000000 +0000
-+++ KasumiAddWindow.hxx
-@@ -10,6 +10,13 @@
- #include "KasumiWord.hxx"
- #include "KasumiConfiguration.hxx"
- 
-+void _call_back_add_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data);
-+void _call_back_add_window_quit(GtkWidget *widget, gpointer data);
-+void _call_back_add_window_add(GtkWidget *widget, gpointer data);
-+void _call_back_manage_mode(GtkWidget *widget, gpointer data);
-+void _call_back_add_window_changed_word_class_combo(GtkWidget *widget, gpointer data);
-+void _call_back_selection_data_received(GtkWidget *widget, GtkSelectionData *selection_data, gpointer data);
-+
- class KasumiAddWindow{
-   friend void _call_back_add_window_delete_event(GtkWidget *widget,
-                                                      GdkEvent *event,
diff --git a/inputmethod/kasumi/patches/patch-ac b/inputmethod/kasumi/patches/patch-ac
deleted file mode 100644
index 393fb610c2e..00000000000
--- a/inputmethod/kasumi/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/07 02:00:15 obache Exp $
-
---- KasumiMainWindow.hxx.orig	2005-09-04 18:40:38.000000000 +0000
-+++ KasumiMainWindow.hxx
-@@ -27,6 +27,23 @@ enum _SearchByEnum{
- 
- typedef _SearchByEnum SearchBy;
- 
-+void _call_back_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data);
-+void _call_back_quit(GtkWidget *widget, gpointer data);
-+void _call_back_store(GtkWidget *widget, gpointer data);
-+void _call_back_add(GtkWidget *widget, gpointer data);
-+void _call_back_remove(GtkWidget *widget, gpointer data);
-+void _call_back_adding_mode(GtkWidget *widget, gpointer data);
-+void _call_back_changed_list_cursor(GtkWidget *widget, gpointer data);
-+void _call_back_changed_sound_entry(GtkWidget *widget, gpointer data);
-+void _call_back_changed_spelling_entry(GtkWidget *widget, gpointer data);
-+void _call_back_changed_frequency_spin(GtkWidget *widget, gpointer data);
-+void _call_back_changed_word_class_combo(GtkWidget *widget, gpointer data);
-+void _call_back_changed_verb_type_combo(GtkWidget *widget, gpointer data);
-+void _call_back_toggled_check(GtkWidget *widget, gpointer data);
-+void _call_back_changed_search_entry(GtkWidget *widget, gpointer data);
-+void _call_back_activate_search_entry(GtkWidget *widget, gpointer data);
-+void _call_back_clicked_column_header(GtkTreeViewColumn *column, gpointer data);
-+
- class KasumiMainWindow : public KasumiDicEventListener{
-   friend void _call_back_delete_event(GtkWidget *widget,
-                                       GdkEvent *event,