5 files changed, 10 insertions, 66 deletions

diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile
index 17b8223e2272..f5e84b23ce8b 100644
--- a/chinese/ibus-chewing/Makefile
+++ b/chinese/ibus-chewing/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	zh-ibus-chewing
-# Date created:				24 December 2009
-# Whom:					Eric L. Chen <lihong@ieee.org>
-#
+# Created By: Eric L. Chen <lihong@ieee.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ibus-chewing
-PORTVERSION=	1.3.10
-PORTREVISION=	2
+PORTVERSION=	1.4.2
 CATEGORIES=	chinese
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
@@ -15,13 +10,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 MAINTAINER=	lihong@ieee.org
 COMMENT=	Chewing engine for IBus
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2 \
 		${LOCALBASE}/share/cmake/Modules/ManageEnvironment.cmake:${PORTSDIR}/devel/cmake-fedora \
 		ibus-daemon:${PORTSDIR}/textproc/ibus
 RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
-LIB_DEPENDS=	chewing.3:${PORTSDIR}/chinese/libchewing
+LIB_DEPENDS=	chewing:${PORTSDIR}/chinese/libchewing
 
-CMAKE_ARGS+=	-DSYSCONF_INSTALL_DIR=${PREFIX}/etc
+CMAKE_ARGS+=	-DSYSCONF_INSTALL_DIR=${PREFIX}/etc \
+		-DLIB_DIR=${PREFIX}/lib
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/chinese/ibus-chewing/distinfo b/chinese/ibus-chewing/distinfo
index 17b5cb266e5f..b810b913b175 100644
--- a/chinese/ibus-chewing/distinfo
+++ b/chinese/ibus-chewing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-chewing-1.3.10-Source.tar.gz) = 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8
-SIZE (ibus-chewing-1.3.10-Source.tar.gz) = 75365
+SHA256 (ibus-chewing-1.4.2-Source.tar.gz) = 857f479ebd85ecc217550573f80e1bff91b6e9bca4d1c9189f790fa6a9e3f75f
+SIZE (ibus-chewing-1.4.2-Source.tar.gz) = 84351
diff --git a/chinese/ibus-chewing/files/patch-src-IBusChewingEngine-input-events.c b/chinese/ibus-chewing/files/patch-src-IBusChewingEngine-input-events.c
deleted file mode 100644
index fcf52658a6dc..000000000000
--- a/chinese/ibus-chewing/files/patch-src-IBusChewingEngine-input-events.c
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/407695
-
---- src/IBusChewingEngine-input-events.c
-+++ src/IBusChewingEngine-input-events.c
-@@ -291,12 +291,21 @@
- 	/* Toggle Full <-> Half */
- 	chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
-     }else if (strcmp(prop_name,"chewing_settings_prop")==0){
--	if (self->settings_prop->state==PROP_STATE_UNCHECKED){
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+	if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
-+#else
-+	if (self->settings_prop->state==PROP_STATE_UNCHECKED)
-+#endif
-+	{
- 	    if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
- 		self_save_config_all(self);
- 	    }
- 	    gtk_widget_hide(self->setting_dialog);
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+		ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
-+#else
- 	    self->settings_prop->state=PROP_STATE_UNCHECKED;
-+#endif
- 	}
-     }else{
- 	G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);
diff --git a/chinese/ibus-chewing/files/patch-src-IBusChewingEngine.gob b/chinese/ibus-chewing/files/patch-src-IBusChewingEngine.gob
deleted file mode 100644
index f2d4f777afd9..000000000000
--- a/chinese/ibus-chewing/files/patch-src-IBusChewingEngine.gob
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/407695
-
---- src/IBusChewingEngine.gob
-+++ src/IBusChewingEngine.gob
-@@ -1041,12 +1041,21 @@
- 	    /* Toggle Full <-> Half */
- 	    chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context));
- 	}else if (strcmp(prop_name,"chewing_settings_prop")==0){
--	    if (self->settings_prop->state==PROP_STATE_UNCHECKED){
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+		if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED)
-+#else
-+	    if (self->settings_prop->state==PROP_STATE_UNCHECKED)
-+#endif
-+		{
- 		if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){
- 		    self_save_config_all(self);
- 		}
- 		gtk_widget_hide(self->setting_dialog);
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+		ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED);
-+#else
- 		self->settings_prop->state=PROP_STATE_UNCHECKED;
-+#endif
- 	    }
- 	}else{
- 	    G_DEBUG_MSG(3,"[I3]  property_activate(-, %s, %u) not recognized",prop_name, prop_state);
diff --git a/chinese/ibus-chewing/pkg-plist b/chinese/ibus-chewing/pkg-plist
index 92fe140203d1..d109ff4ac1ab 100644
--- a/chinese/ibus-chewing/pkg-plist
+++ b/chinese/ibus-chewing/pkg-plist
@@ -1,4 +1,4 @@
-libexec/ibus-engine-chewing
+lib/ibus-engine-chewing
 %%DOCSDIR%%-%%PORTVERSION%%/AUTHORS
 %%DOCSDIR%%-%%PORTVERSION%%/COPYING
 %%DOCSDIR%%-%%PORTVERSION%%/ChangeLog