Index: head/japanese/scim-uim/Makefile
===================================================================
--- head/japanese/scim-uim/Makefile	(revision 189301)
+++ head/japanese/scim-uim/Makefile	(revision 189302)
@@ -1,54 +1,53 @@
 # New ports collection makefile for:    ja-scim-uim
 # Date created:		15 Nov 2004
 # Whom:			Seiya Yanagita <s_yanagita@ybb.ne.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://freedesktop.org/~suzhe/sources/
 MASTER_SITE_SUBDIR=scim
 
 MAINTAINER=	s_yanagita@ybb.ne.jp
 COMMENT=	SCIM IMEngine module using UIM input method library
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	uim:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		Does not compile
-
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	lthack
 USE_X_LIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .include <bsd.port.pre.mk>
 
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa ${FILESDIR}/extra-patch-ab
 .if ${OSVERSION} < 500035
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/include/stlport" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}"
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-4-stable
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-4-stable
 .else
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 	@${ECHO}
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/scim-uim/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/japanese/scim-uim/files/extra-patch-aa
===================================================================
--- head/japanese/scim-uim/files/extra-patch-aa	(nonexistent)
+++ head/japanese/scim-uim/files/extra-patch-aa	(revision 189302)
@@ -0,0 +1,42 @@
+--- src/scim_uim_imengine.cpp.orig	Mon Aug  8 12:08:34 2005
++++ src/scim_uim_imengine.cpp	Mon Mar 26 17:12:57 2007
+@@ -823,39 +823,6 @@
+     }
+ }
+ 
+-void
+-UIMInstance::uim_surrounding_text_request_cb (void *ptr)
+-{
+-    UIMInstance *this_ptr = static_cast <UIMInstance *> (ptr);
+-    if (this_ptr) {
+-
+-        SCIM_DEBUG_IMENGINE(2) << "uim_surrounding_text_request_cb.\n";
+-
+-        WideString wstr;
+-        int cursor;
+-
+-        if (this_ptr->get_surrounding_text (wstr, cursor)) {
+-            String str = utf8_wcstombs (wstr);
+-            uim_set_surrounding_text (this_ptr->m_uc, str.c_str (), cursor, wstr.length ());
+-        }
+-    }
+-}
+-
+-int
+-UIMInstance::uim_surrounding_text_delete_cb  (void *ptr, int offset, int len)
+-{
+-    UIMInstance *this_ptr = static_cast <UIMInstance *> (ptr);
+-    int ret = -1;
+-
+-    if (this_ptr) {
+-        SCIM_DEBUG_IMENGINE(2) << "uim_surrounding_text_delete_cb.\n";
+-        
+-        if (this_ptr->delete_surrounding_text (offset, len))
+-            ret = 0;
+-    }
+-
+-    return ret;
+-}
+ /*
+ vi:ts=4:nowrap:ai:expandtab
+ */

Property changes on: head/japanese/scim-uim/files/extra-patch-aa
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/japanese/scim-uim/files/extra-patch-ab
===================================================================
--- head/japanese/scim-uim/files/extra-patch-ab	(nonexistent)
+++ head/japanese/scim-uim/files/extra-patch-ab	(revision 189302)
@@ -0,0 +1,12 @@
+--- src/scim_uim_imengine.h.orig	Mon Mar 26 17:12:19 2007
++++ src/scim_uim_imengine.h	Mon Mar 26 17:12:55 2007
+@@ -104,9 +104,6 @@
+     static void uim_cand_select_cb       (void *ptr, int index);
+     static void uim_cand_shift_page_cb   (void *ptr, int dir);
+     static void uim_cand_deactive_cb     (void *ptr);
+-
+-    static void uim_surrounding_text_request_cb (void *ptr);
+-    static int  uim_surrounding_text_delete_cb  (void *ptr, int offset, int len);
+ };
+ #endif
+ /*

Property changes on: head/japanese/scim-uim/files/extra-patch-ab
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/japanese/scim-uim/pkg-plist
===================================================================
--- head/japanese/scim-uim/pkg-plist	(revision 189301)
+++ head/japanese/scim-uim/pkg-plist	(revision 189302)
@@ -1,6 +1,5 @@
-lib/scim-1.0/IMEngine/uim.a
-lib/scim-1.0/IMEngine/uim.la
-lib/scim-1.0/IMEngine/uim.so
+lib/scim-1.0/1.4.0/IMEngine/uim.a
+lib/scim-1.0/1.4.0/IMEngine/uim.la
+lib/scim-1.0/1.4.0/IMEngine/uim.so
 share/scim/icons/scim-uim.png
-@dirrmtry lib/scim-1.0/IMEngine
-@dirrmtry lib/scim-1.0/icons
+@dirrmtry share/scim/icons

Property changes on: head/japanese/scim-uim/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property