6 files changed, 12 insertions, 112 deletions

diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index b061be860752..209b77aeabc1 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	kasumi
-PORTVERSION=	0.10
-PORTREVISION=	1
-#PORTREVISION=	0
+PORTVERSION=	2.2
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/16557
+MASTER_SITE_SUBDIR=	${PORTNAME}/22902
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A dictionary management tool for anthy
 
-USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 USE_GNOME=	gnomehier gtk20
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
+MAN1=		kasumi.1
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git a/japanese/kasumi/distinfo b/japanese/kasumi/distinfo
index a210c7584902..fe4771535d8e 100644
--- a/japanese/kasumi/distinfo
+++ b/japanese/kasumi/distinfo
@@ -1,3 +1,3 @@
-MD5 (kasumi-0.10.tar.gz) = bfeba1ef78a15da7f180f04ec271f987
-SHA256 (kasumi-0.10.tar.gz) = 6567bdca3546dd2d168a6786dfcf8d4341979dbd04970ec6c0272be9fd87fa17
-SIZE (kasumi-0.10.tar.gz) = 256132
+MD5 (kasumi-2.2.tar.gz) = d0c3a605fc95b89d4e102ffdd0b4c37d
+SHA256 (kasumi-2.2.tar.gz) = b11e72cf32eaea438ef685faee74a8b86a789aa4de68f12b13ea1e7b23f2b108
+SIZE (kasumi-2.2.tar.gz) = 272544
diff --git a/japanese/kasumi/files/patch-KasumiAddWindow.hxx b/japanese/kasumi/files/patch-KasumiAddWindow.hxx
deleted file mode 100644
index f119183878d6..000000000000
--- a/japanese/kasumi/files/patch-KasumiAddWindow.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
---- KasumiAddWindow.hxx.orig	Fri Sep  2 19:51:09 2005
-+++ KasumiAddWindow.hxx	Sun Apr 16 21:09:27 2006
-@@ -10,6 +10,23 @@
- #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/japanese/kasumi/files/patch-KasumiMainWindow.hxx b/japanese/kasumi/files/patch-KasumiMainWindow.hxx
deleted file mode 100644
index a38d0abe344f..000000000000
--- a/japanese/kasumi/files/patch-KasumiMainWindow.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
---- KasumiMainWindow.hxx.orig	Fri Sep  2 20:18:38 2005
-+++ KasumiMainWindow.hxx	Sun Apr 16 21:09:27 2006
-@@ -27,6 +27,41 @@
- 
- 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,
diff --git a/japanese/kasumi/files/patch-KasumiWord.cxx b/japanese/kasumi/files/patch-KasumiWord.cxx
deleted file mode 100644
index 7351fcf7c964..000000000000
--- a/japanese/kasumi/files/patch-KasumiWord.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
---- KasumiWord.cxx.orig	Mon Jan 10 20:30:37 2005
-+++ KasumiWord.cxx	Mon Jan 10 20:38:01 2005
-@@ -16,24 +16,27 @@
- string KasumiWord::convertUTF8ToEUCJP(const string &aUTF8){
-   char *utf8 = (char*)malloc(strlen(aUTF8.c_str())+1);
-   strcpy(utf8, aUTF8.c_str());
-+  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());
-+  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/japanese/kasumi/pkg-plist b/japanese/kasumi/pkg-plist
index 2294f88e9cbb..0be98f183c95 100644
--- a/japanese/kasumi/pkg-plist
+++ b/japanese/kasumi/pkg-plist
@@ -1,4 +1,5 @@
 bin/kasumi
 %%NLS%%share/locale/ja/LC_MESSAGES/kasumi.mo
-share/kasumi/kasumi.png
-@dirrm share/kasumi
+%%NLS%%share/locale/it/LC_MESSAGES/kasumi.mo
+share/applications/kasumi.desktop
+share/pixmaps/kasumi.png