Index: head/chinese/gcin/Makefile
===================================================================
--- head/chinese/gcin/Makefile	(revision 435413)
+++ head/chinese/gcin/Makefile	(revision 435414)
@@ -1,86 +1,86 @@
 # Created by: Shen Chuan-Hsing
 # $FreeBSD$
 
 PORTNAME=	gcin
 PORTVERSION=	2.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://hyperrate.com/gcin-source/
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.xz
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Traditional Chinese input utility in X
 
 LICENSE=	LGPL21
 
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--use_gtk3=N --use_qt3=N
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig tar:xz
 USE_XORG=	x11 xtst xext
 INSTALLS_ICONS=	YES
 USE_LDCONFIG=	YES
 
 OPTIONS_DEFINE=	ANTHY QT_IM_MODULE DOCS
 OPTIONS_SUB=	yes
 ANTHY_DESC=	Japanese anthy IM module
 QT_IM_MODULE_DESC=	QT IM module
 
 QT_IM_MODULE_USE=	QT4=inputmethods,qmake_build,moc_build,corelib,gui
 QT_IM_MODULE_LIB_DEPENDS=	libmng.so:graphics/libmng
 QT_IM_MODULE_CONFIGURE_OFF=	--use_qt4=N
 
 ANTHY_BUILD_DEPENDS=	${LOCALBASE}/include/anthy/anthy.h:japanese/anthy
 ANTHY_LIB_DEPENDS=	libanthy.so:japanese/anthy
 ANTHY_CONFIGURE_OFF=	--use_anthy=N
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \
 		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,g; \
 		s,QT4_IM_DIR=/usr,QT4_IM_DIR=$$prefix,g; \
 		s,-ldl,,; \
 		s,mandir=$$datadir,mandir=$$prefix,; \
 		s,/usr/share,$$prefix/share,; \
-		s,/usr/bin/moc,${LOCALBASE}/bin/moc-qt4,; \
+		s,/usr/bin/moc,${MOC},; \
 		1, 300 s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,; \
 		/GCIN_DEBUG/ d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,; \
 		s,%%PREFIX%%,${PREFIX},;' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '94 s/gcin/gcin-setup/' ${WRKSRC}/gcin-common.cpp
 	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 		${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
 	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \
 		${WRKSRC}/scripts/Makefile
 	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \
 		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
 		${WRKSRC}/scripts/gtab.append_prepare \
 		${WRKSRC}/scripts/tsin-gtab-import \
 		${WRKSRC}/scripts/tsin-gtab-edit
 	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; 12,13 s/=/ /; \
 		s/export/setenv/; s/$$UTF8ED/xdg-open/' \
 		${WRKSRC}/scripts/html-browser
 	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,;' \
 		${WRKSRC}/gtk-im/gtkimcontextgcin.c
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
 		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
 	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile
 
 post-build:
 .if !defined(DEBUG_FLAGS)
 	@${FIND} ${WRKSRC} -name "*.so*" | ${XARGS} ${STRIP_CMD}
 .endif
 
 post-install:
 .if !defined(DEBUG_FLAGS)
 .for f in gcin* gtab-merge juyin-learn phoa2* sim2trad trad2sim ts-edit tsa2d32 tsd2a32 tsin2gtab-phrase tslearn
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/chinese/gcin/files/patch-Makefile
===================================================================
--- head/chinese/gcin/files/patch-Makefile	(revision 435413)
+++ head/chinese/gcin/files/patch-Makefile	(revision 435414)
@@ -1,118 +1,128 @@
---- Makefile.orig	2014-01-26 14:41:39.000000000 +0800
-+++ Makefile	2014-04-12 10:55:35.584554559 +0800
+--- Makefile.orig	2014-01-26 06:41:39 UTC
++++ Makefile
 @@ -4,8 +4,11 @@ include config.mak
  include suffixes-rule
  
  gcin_tsin_o = tsin.o tsin-util.o win0.o win1.o tsin-parse.o
 +SOURCES_gcin_tsin = tsin.cpp tsin-util.cpp win0.cpp win1.cpp tsin-parse.cpp
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
 +SOURCES_gcin_pho = win-pho.cpp pho.cpp pho-util.cpp pho-sym.cpp table-update.cpp pho-dbg.cpp
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o gtab-buf.o
 +SOURCES_gcin_gtab = gtab.cpp win-gtab.cpp gtab-util.cpp gtab-list.cpp gtab-buf.cpp
  
  GCIN_SO= gcin1.so gcin2.so
  
 @@ -15,6 +18,11 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gci
       win-save-phrase.o unix-exec.o pho-kbm-name.o statistic.o tsin-scan.o gcin-module.o lang.o \
       gcin-module-cb.o gtab-init.o fullchar.o gtab-tsin-fname.o win-screen-status.o
  
 +SOURCES=gcin.cpp eve.cpp util.cpp gcin-conf.cpp gcin-settings.cpp locale.cpp gcin-icon.cpp about.cpp html-browser.cpp \
 +     gcin-exec-script.cpp pho-play.cpp cache.cpp gtk_bug_fix.c phrase-save-menu.cpp \
 +     $(SOURCES_gcin_pho) $(SOURCES_gcin_gtab) gcin-common.cpp phrase.cpp t2s-lookup.cpp gtab-use-count.cpp \
 +     win-save-phrase.cpp unix-exec.cpp pho-kbm-name.cpp statistic.cpp tsin-scan.cpp gcin-module.cpp lang.cpp \
 +     gcin-module-cb.o gtab-init.o fullchar.o gtab-tsin-fname.o win-screen-status.cpp
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
               table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o  \
 @@ -101,7 +109,7 @@ PROGS_CV=kbmcv pin-juyin
  all:	$(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec
  	$(MAKE) -C data
  	$(MAKE) -C gtk-im
 -	if [ $(BUILD_MODULE) = 'Y' ]; then $(MAKE) -C modules; fi
 +	$(MAKE) -C modules
  	if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi
  	if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
 @@ -110,18 +118,18 @@ all:	$(PROGS) trad2sim $(GCIN_SO) $(DATA
  #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
  
  gcin:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
 -	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
-+	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB)
++	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
  	rm -f core.* vgcore.*
  	ln -sf $@ $@.test
  
  gcin-nocur:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
 -	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
-+	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB)
++	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
  	rm -f core.*
  
 -tslearn:        $(OBJS_TSLEARN)
 +tslearn:        $(OBJS_TSLEARN) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS)
  
 -ts-edit:        $(OBJS_TS_EDIT)
 +ts-edit:        $(OBJS_TS_EDIT) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS)
  
  ts-contribute:	ts-edit
 @@ -143,7 +151,7 @@ gcin-tools:     $(OBJS_gcin_tools) im-cl
  phoa2d: $(OBJS_phoa2d) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_phoa2d) -L./im-client -lgcin-im-client $(LDFLAGS)
  
 -phod2a: $(OBJS_phod2a)
 +phod2a: $(OBJS_phod2a) im-client/libgcin-im-client.so
  	$(CCLD) -lX11 -o $@ $(OBJS_phod2a) $(LDFLAGS)
  
  tsa2d32:  $(OBJS_tsa2d32) im-client/libgcin-im-client.so
 @@ -165,16 +173,16 @@ gtab-merge:  $(OBJS_gtab_merge)
  kbmcv:  $(OBJS_kbmcv)
  	$(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
  
 -gcin-gb-toggle:	$(OBJS_gcin_gb_toggle)
 +gcin-gb-toggle:	$(OBJS_gcin_gb_toggle) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
  
 -gcin-kbm-toggle:	$(OBJS_gcin_kbm_toggle)
 +gcin-kbm-toggle:	$(OBJS_gcin_kbm_toggle) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
  
 -gcin-exit:	$(OBJS_gcin_exit)
 +gcin-exit:	$(OBJS_gcin_exit) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS)
  
 -gcin-message:	$(OBJS_gcin_message)
 +gcin-message:	$(OBJS_gcin_message) im-client/libgcin-im-client.so
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
  
  pin-juyin:	$(OBJS_pin_juyin)
-@@ -223,12 +231,12 @@ install:
+@@ -223,22 +231,18 @@ install:
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
  	$(MAKE) -C gtk-im install
 -	if [ $(BUILD_MODULE) = 'Y' ]; then $(MAKE) -C modules install; fi
 +	$(MAKE) -C modules install
  	if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im install; fi
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
  	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
 -	if [ $(prefix) = /usr/local ]; then \
 -	   install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \
+-	   install -d $(DOC_DIR); \
+-	   install -m 644 README.html Changelog.html $(DOC_DIR); \
 +	if [ $(prefix) = /nonstaged ]; then \
 +	   install -m 644 gcin.png $(prefix)/share/icons/hicolor/64x64/apps; \
- 	   install -d $(DOC_DIR); \
- 	   install -m 644 README.html Changelog.html $(DOC_DIR); \
  	   install $(PROGS) $(bindir); \
-@@ -246,6 +254,7 @@ install:
+ 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ 	   rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
+ 	   rm -f $(bindir)/ts-contribute-en; ln -sf ts-edit $(bindir)/ts-contribute-en; \
  	   rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
+ 	else \
+-	   install -d $(DOC_DIR_i); \
+-	   install -m 644 README.html Changelog.html $(DOC_DIR_i); \
+ 	   install -s $(PROGS) $(bindir); \
+ 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ 	   rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
+@@ -246,6 +250,7 @@ install:
+ 	   rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
  	fi
  	$(MAKE) -C scripts install
 +	$(MAKE) -C man install
  	$(MAKE) -C menu install
  	if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi
  
-@@ -279,4 +288,4 @@ gcin-fedora.spec:	gcin-fedora.spec.in VE
+@@ -279,4 +284,4 @@ gcin-fedora.spec:	gcin-fedora.spec.in VE
  	rm -f $@
  	sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@
  
 -include .depend
 +#include .depend
Index: head/chinese/gcin/files/patch-modules__Makefile
===================================================================
--- head/chinese/gcin/files/patch-modules__Makefile	(revision 435413)
+++ head/chinese/gcin/files/patch-modules__Makefile	(revision 435414)
@@ -1,8 +1,8 @@
---- modules/Makefile.orig	2013-10-05 11:31:52.000000000 +0800
-+++ modules/Makefile	2014-04-12 10:57:02.970548467 +0800
+--- modules/Makefile.orig	2013-10-05 03:31:52 UTC
++++ modules/Makefile
 @@ -38,4 +38,4 @@ clean:
  .depend:
  	$(CCX) $(CFLAGS) -MM *.cpp > $@
  
 -include .depend
 +#include .depend
Index: head/chinese/gcin/files/patch-qt4-im__Makefile
===================================================================
--- head/chinese/gcin/files/patch-qt4-im__Makefile	(revision 435413)
+++ head/chinese/gcin/files/patch-qt4-im__Makefile	(revision 435414)
@@ -1,17 +1,17 @@
---- qt4-im/Makefile.orig	2012-03-05 20:26:54.000000000 +0800
-+++ qt4-im/Makefile	2014-04-17 17:21:30.838404919 +0800
+--- qt4-im/Makefile.orig	2012-03-05 12:26:54 UTC
++++ qt4-im/Makefile
 @@ -3,7 +3,7 @@ QT=qt4
  QTIM=$(QT)/plugins/inputmethods
  IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM)
  
 -INCS=-I../im-client -I/usr/include/X11 `pkg-config QtCore QtGui --cflags`
 +INCS=-I../im-client -I$(prefix)/include -I$(prefix)/include/X11 `pkg-config QtCore QtGui --cflags`
  CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC  -DQT4 -DQT_SHARED \
  -DQT_IMMODULE -DPIC
  OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o
 @@ -35,4 +35,4 @@ clean:
  .depend:
  	$(CXX) $(CXXFLAGS) -MM *.cpp > $@
  
 -include .depend
 +#include .depend