4 files changed, 30 insertions, 33 deletions

diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 95c4f48b0fab..a8a9a8f8732b 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -6,28 +6,19 @@
 #
 
 PORTNAME=	libtomoe-gtk
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.4.0
+#PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/17171
+MASTER_SITE_SUBDIR=tomoe/22894
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	TOMOE GTK+ library
 
 LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe
 
-USE_X_PREFIX=	yes
 USE_GNOME=	lthack gnomehack gtk20
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-
-PLIST_DIRS=	include/tomoe
-PLIST_FILES=	include/tomoe/tomoe_candidates_view.h \
-		include/tomoe/tomoe_canvas.h include/tomoe/tomoe-gtk.h \
-		include/tomoe/tomoe_window.h \
-		lib/libtomoe-gtk.a lib/libtomoe-gtk.la \
-		lib/libtomoe-gtk.so lib/libtomoe-gtk.so.0 \
-		libdata/pkgconfig/libtomoe-gtk.pc
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/libtomoe-gtk/distinfo b/japanese/libtomoe-gtk/distinfo
index 63beb61c45f1..c9c2aac9e0f0 100644
--- a/japanese/libtomoe-gtk/distinfo
+++ b/japanese/libtomoe-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtomoe-gtk-0.1.0.tar.gz) = e9b887189ee408902a0f85d9b1cde06f
-SHA256 (libtomoe-gtk-0.1.0.tar.gz) = de00404262d5601edd953d2c83adc8e4897c2a34dfa2d8248f521136c266cc52
-SIZE (libtomoe-gtk-0.1.0.tar.gz) = 330885
+MD5 (libtomoe-gtk-0.4.0.tar.gz) = ccf5d11ea77cb57efc55c811d369bb19
+SHA256 (libtomoe-gtk-0.4.0.tar.gz) = 1761463a6af2c775949179acb83020fa73a3b7617a2f643b76165e1d7ec9d567
+SIZE (libtomoe-gtk-0.4.0.tar.gz) = 374896
diff --git a/japanese/libtomoe-gtk/files/patch-src::tomoe_canvas.c b/japanese/libtomoe-gtk/files/patch-src::tomoe_canvas.c
deleted file mode 100644
index 303bfb332b42..000000000000
--- a/japanese/libtomoe-gtk/files/patch-src::tomoe_canvas.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/tomoe_canvas.c
-diff -u -p src/tomoe_canvas.c.orig src/tomoe_canvas.c
---- src/tomoe_canvas.c.orig	Tue Oct 18 17:56:15 2005
-+++ src/tomoe_canvas.c	Mon Dec 19 03:53:30 2005
-@@ -1073,9 +1073,11 @@ draw_stroke (GList *stroke, TomoeCanvas 
-     
-     for (node = stroke; node; node = g_list_next (node)) {
-         GList *next = g_list_next (node);
-+        point *p1, *p2;
-         if (!next) break;
- 
--        point *p1 = (point*) node->data, *p2 = (point*) next->data;
-+        p1 = (point*) node->data;
-+        p2 = (point*) next->data;
-         tomoe_canvas_draw_line (canvas, p1, p2, FALSE);
-     }
-     draw_annotate (stroke, canvas, *index);
diff --git a/japanese/libtomoe-gtk/pkg-plist b/japanese/libtomoe-gtk/pkg-plist
new file mode 100644
index 000000000000..420bfce1e01c
--- /dev/null
+++ b/japanese/libtomoe-gtk/pkg-plist
@@ -0,0 +1,23 @@
+include/tomoe/gtk/tomoe-canvas.h
+include/tomoe/gtk/tomoe-char-table.h
+include/tomoe/gtk/tomoe-details.h
+include/tomoe/gtk/tomoe-edit-char.h
+include/tomoe/gtk/tomoe-edit-meta.h
+include/tomoe/gtk/tomoe-edit-strokes.h
+include/tomoe/gtk/tomoe-gtk.h
+include/tomoe/gtk/tomoe-reading-search.h
+include/tomoe/gtk/tomoe-scrollable.h
+include/tomoe/gtk/tomoe-stroke-search.h
+include/tomoe/gtk/tomoe-window.h
+@dirrm include/tomoe/gtk
+@dirrmtry include/tomoe
+lib/libtomoe-gtk.a
+lib/libtomoe-gtk.la
+lib/libtomoe-gtk.so
+lib/libtomoe-gtk.so.1
+libdata/pkgconfig/libtomoe-gtk.pc
+share/libtomoe-gtk/tomoe-data-view.png
+share/libtomoe-gtk/tomoe-dictionary.png
+share/libtomoe-gtk/tomoe-handwriting.png
+share/libtomoe-gtk/tomoe-search.png
+@dirrm share/libtomoe-gtk