3 files changed, 29 insertions, 24 deletions

diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 285163114a08..adf1a26f683e 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -26,12 +26,6 @@ OPTIONS_DEFINE=	ANTHY QT_IM_MODULE
 ANTHY_DESC=	Japanese anthy IM module
 QT_IM_MODULE_DESC=	QT IM module
 
-MAN1=		gcin.1 gcin-exit.1 gcin2tab.1 gcin-gb-toggle.1 gcin-kbm-toggle.1 \
-		gcin-message.1 gcin-tools.1 gtab-merge.1 juyin-learn.1 \
-		phoa2d.1 sim2trad.1 tsa2d32.1 tslearn.1 \
-		ts-contribute.1 ts-edit.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT_IM_MODULE}
@@ -103,17 +97,8 @@ post-build:
 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} ${PREFIX}/bin/${f}
-.endfor
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for f in Changelog.html README.html
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .endif
-	@${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 
 .include <bsd.port.post.mk>
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
index 55c3150bc842..c8720190f1eb 100644
--- a/chinese/gcin/files/patch-Makefile
+++ b/chinese/gcin/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-12-19 10:45:09.000000000 +0800
-+++ Makefile	2012-02-03 08:29:40.000000000 +0800
-@@ -90,7 +90,7 @@ PROGS_CV=kbmcv pin-juyin
+--- ./Makefile.orig	2012-12-08 00:32:13.000000000 +0000
++++ ./Makefile	2014-01-04 22:34:02.000000000 +0000
+@@ -94,7 +94,7 @@
  all:	$(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec
  	$(MAKE) -C data
  	$(MAKE) -C gtk-im
@@ -9,7 +9,7 @@
  	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
-@@ -204,7 +204,7 @@ install:
+@@ -215,11 +215,11 @@
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
  	$(MAKE) -C gtk-im install
@@ -18,8 +18,13 @@
  	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
-@@ -221,6 +221,7 @@ install:
- 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+-	if [ $(prefix) = /usr/local ]; then \
++	if [ $(prefix) = /nonstaged ]; then \
+ 	   install -m 644 gcin.png /usr/share/icons; \
+ 	   install -d $(DOC_DIR); \
+ 	   install -m 644 README.html Changelog.html $(DOC_DIR); \
+@@ -234,6 +234,7 @@
+ 	   rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
  	fi
  	$(MAKE) -C scripts install
 +	$(MAKE) -C man install
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 97f8fbd8139d..8c71598f8d5c 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -27,6 +27,21 @@ lib/gcin/intcode-module.so
 lib/gcin/libgcin-im-client.so
 lib/gcin/libgcin-im-client.so.1.2.5
 lib/gcin/libgcin-im-client.so.1
+man/man1/gcin-exit.1.gz
+man/man1/gcin-gb-toggle.1.gz
+man/man1/gcin-kbm-toggle.1.gz
+man/man1/gcin-message.1.gz
+man/man1/gcin-tools.1.gz
+man/man1/gcin.1.gz
+man/man1/gcin2tab.1.gz
+man/man1/gtab-merge.1.gz
+man/man1/juyin-learn.1.gz
+man/man1/phoa2d.1.gz
+man/man1/sim2trad.1.gz
+man/man1/ts-contribute.1.gz
+man/man1/ts-edit.1.gz
+man/man1/tsa2d32.1.gz
+man/man1/tslearn.1.gz
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/gtab.append_prepare
 %%DATADIR%%/script/html-browser
@@ -153,5 +168,5 @@ share/icons/gcin.png
 @dirrmtry lib/gtk-2.0/immodules
 @dirrmtry lib/gtk-2.0
 @dirrm lib/gcin
-@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache