Upgrade to 2.7.1.

6 files changed, 49 insertions, 11 deletions

diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 99cc4de668a3..b4f1558b9871 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTVERSION=	2.7.1
+PORTREVISION=	0
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
@@ -114,7 +114,7 @@ post-build:
 
 post-install:
 .if !defined(DEBUG_FLAGS)
-.for f in gcin* gtab-merge juyin-learn phoa2* sim2trad trad2sim ts*
+.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
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 49c2f4e5913c..15180a4609ba 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcin-2.7.0.tar.xz) = 4002cf81df9f651407a4a7d36428bb6c6e970b807fe49b078985901293cb8329
-SIZE (gcin-2.7.0.tar.xz) = 2680408
+SHA256 (gcin-2.7.1.tar.xz) = d51dda364402d977a6837464ece18ebe526e4a8291698728435bf5097457aa09
+SIZE (gcin-2.7.1.tar.xz) = 2689688
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
index 4b9ed4dce0d8..14cd7604865b 100644
--- a/chinese/gcin/files/patch-Makefile
+++ b/chinese/gcin/files/patch-Makefile
@@ -1,6 +1,15 @@
---- Makefile.orig	2012-01-31 16:17:52.000000000 +0800
-+++ Makefile	2012-01-31 16:18:06.000000000 +0800
-@@ -221,6 +221,7 @@
+--- Makefile.orig	2011-12-19 10:45:09.000000000 +0800
++++ Makefile	2012-01-31 20:30:12.000000000 +0800
+@@ -90,7 +90,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
+@@ -221,6 +221,7 @@ install:
  	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
  	fi
  	$(MAKE) -C scripts install
diff --git a/chinese/gcin/files/patch-gcin-exit.cpp b/chinese/gcin/files/patch-gcin-exit.cpp
new file mode 100644
index 000000000000..bd1fd9bee91f
--- /dev/null
+++ b/chinese/gcin/files/patch-gcin-exit.cpp
@@ -0,0 +1,11 @@
+--- gcin-exit.cpp.orig	2012-01-25 19:29:28.000000000 +0800
++++ gcin-exit.cpp	2012-01-25 19:29:38.000000000 +0800
+@@ -12,7 +12,7 @@ int main()
+ #if UNIX
+   Display *dpy = GDK_DISPLAY();
+   if (find_gcin_window(dpy)==None)
+-    return;
++    return 0;
+   send_gcin_message(dpy, GCIN_EXIT_MESSAGE);
+ #else
+   if (!find_gcin_window())
diff --git a/chinese/gcin/files/patch-pho-play.cpp b/chinese/gcin/files/patch-pho-play.cpp
new file mode 100644
index 000000000000..eac63a6344b3
--- /dev/null
+++ b/chinese/gcin/files/patch-pho-play.cpp
@@ -0,0 +1,11 @@
+--- pho-play.cpp.orig	2012-01-25 19:26:50.000000000 +0800
++++ pho-play.cpp	2012-01-25 19:27:29.000000000 +0800
+@@ -12,7 +12,7 @@ int pho_play(phokey_t key)
+   if (!phonetic_speak)
+     return 0;
+   if (test_mode)
+-    return;
++    return 0;
+ 
+   static int pid;
+   static time_t last_time;
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index d7905172ef0f..5c82775d9b7b 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -22,7 +22,7 @@ lib/gtk-2.0/immodules/im-gcin.so
 %%CHEWING_MODULE%%lib/gcin/chewing-module.so
 lib/gcin/gcin1.so
 lib/gcin/gcin2.so
-%%CHEWING_MODULE%%lib/gcin/intcode-module.so
+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
@@ -83,9 +83,12 @@ share/icons/gcin/NewCJ3.png
 share/icons/gcin/4corner.png
 share/icons/gcin/amis-gcin.png
 share/icons/gcin/ar30.png
+share/icons/gcin/ar30-big.png
+share/icons/gcin/ar33.png
 share/icons/gcin/cj-punc.png
 share/icons/gcin/cj.png
 share/icons/gcin/cj5.png
+share/icons/gcin/cj543.png
 share/icons/gcin/chewing.png
 share/icons/gcin/dayi3.png
 share/icons/gcin/en-kana-nippon.png
@@ -104,6 +107,7 @@ share/icons/gcin/hakka.png
 share/icons/gcin/half-simp.png
 share/icons/gcin/half-trad.png
 share/icons/gcin/halfwidth-kana.png
+share/icons/gcin/hangul.png
 share/icons/gcin/intcode.png
 share/icons/gcin/jtcj_gb.png
 share/icons/gcin/juyin.png
@@ -114,10 +118,13 @@ share/icons/gcin/newcj.png
 share/icons/gcin/noseeing.png
 share/icons/gcin/paiwan-gcin.png
 share/icons/gcin/pinyin.png
+share/icons/gcin/russian.png
 share/icons/gcin/sakura.png
 share/icons/gcin/scj.png
 share/icons/gcin/shuangpin.png
 share/icons/gcin/simplex.png
+share/icons/gcin/simplex-punc.png
+share/icons/gcin/symbol_table.png
 share/icons/gcin/symbols.png
 share/icons/gcin/taiwan.png
 share/icons/gcin/telecode.png
@@ -127,7 +134,7 @@ share/icons/gcin/wm2.png
 share/icons/gcin/wubi.png
 share/icons/gcin.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/icons/gcin
+@dirrm share/icons/gcin
 @dirrmtry share/icons
 @dirrmtry share/applications
 @dirrmtry %%DATADIR%%/table
@@ -135,6 +142,6 @@ share/icons/gcin.png
 @dirrmtry %%DATADIR%%
 @dirrmtry lib/gtk-2.0/immodules
 @dirrmtry lib/gtk-2.0
-@dirrmtry lib/gcin
+@dirrm lib/gcin
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules