Update to 2.8.5.

7 files changed, 147 insertions, 26 deletions

diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 6d8ffd6ab0f7..5f567346f694 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcin
-PORTVERSION=	2.8.2
-PORTREVISION=	3
+PORTVERSION=	2.8.5
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://hyperrate.com/gcin-source/
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.xz
@@ -42,6 +41,7 @@ post-patch:
 		s,mandir=$$datadir,mandir=$$prefix,; \
 		s,/usr/share,$$prefix/share,; \
 		s,/usr/bin/moc,${MOC},; \
+		s,%%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,; \
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index ec4a68a59ed9..69f02736f38c 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gcin-2.8.2.tar.xz) = 873e2e87b6bc82324198d3047314ad3387dd34111a04cc295fed43f0100a453e
-SIZE (gcin-2.8.2.tar.xz) = 3892232
+TIMESTAMP = 1488877345
+SHA256 (gcin-2.8.5.tar.xz) = 7a191f71136496e407b2554dd5b8775ebfde4389a37c8a4f3e153485760de93b
+SIZE (gcin-2.8.5.tar.xz) = 4005548
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
index f97b3bc273c4..d6e214df358e 100644
--- a/chinese/gcin/files/patch-Makefile
+++ b/chinese/gcin/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-01-26 14:41:39.000000000 +0800
-+++ Makefile	2014-04-12 10:55:35.584554559 +0800
+--- Makefile.orig	2016-10-20 22:43:16 UTC
++++ Makefile
 @@ -4,8 +4,11 @@ include config.mak
  include suffixes-rule
  
@@ -12,10 +12,11 @@
  
  GCIN_SO= gcin1.so gcin2.so
  
-@@ -15,6 +18,11 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gci
+@@ -14,7 +17,11 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gci
+      $(gcin_pho_o) $(gcin_gtab_o) gcin-common.o phrase.o t2s-lookup.o gtab-use-count.o \
       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 \
@@ -24,7 +25,7 @@
  
  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
+@@ -103,7 +110,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
@@ -33,12 +34,12 @@
  	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
+@@ -113,18 +120,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 $(GCIN_LDFLAGS) -L/usr/X11R6/$(LIB)
++	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L%%PREFIX%%/$(LIB)
  	rm -f core.* vgcore.*
  	ln -sf $@ $@.test
  
@@ -56,16 +57,7 @@
  	$(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)
+@@ -171,16 +178,16 @@ gtab-merge:  $(OBJS_gtab_merge)
  kbmcv:  $(OBJS_kbmcv)
  	$(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
  
@@ -86,7 +78,7 @@
  	$(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:
+@@ -229,13 +236,13 @@ install:
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
  	$(MAKE) -C gtk-im install
@@ -95,6 +87,7 @@
  	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 [ $(QT5_IM) = 'Y' ]; then $(MAKE) -C qt5-im install; fi
 -	if [ $(prefix) = /usr/local ]; then \
 -	   install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \
 +	if [ $(prefix) = /nonstaged ]; then \
@@ -102,7 +95,7 @@
  	   install -d $(DOC_DIR); \
  	   install -m 644 README.html Changelog.html $(DOC_DIR); \
  	   install $(PROGS) $(bindir); \
-@@ -246,6 +254,7 @@ install:
+@@ -253,6 +260,7 @@ install:
  	   rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
  	fi
  	$(MAKE) -C scripts install
@@ -110,7 +103,7 @@
  	$(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
+@@ -287,4 +295,4 @@ gcin-fedora.spec:	gcin-fedora.spec.in VE
  	rm -f $@
  	sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@
  
diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure
new file mode 100644
index 000000000000..42e0ded1a8c2
--- /dev/null
+++ b/chinese/gcin/files/patch-configure
@@ -0,0 +1,93 @@
+--- configure.orig	2017-03-07 17:41:15.493370000 +0800
++++ configure	2017-03-07 17:48:14.458037000 +0800
+@@ -1,4 +1,4 @@
+-##!/bin/bash
++##!/bin/sh
+ 
+ 
+ if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then
+@@ -129,7 +129,7 @@ if [ -z $GTK ]; then
+   echo "According to pkg-config, GTK 2.0 or 3.0 WAS NOT FOUND."
+   echo "please install rpm/package libgtk+2.0_0-devel or libgtk+3.0_0-devel"
+   rm -f config.mak
+-  exits
++  exit
+ fi
+ 
+ echo "$GTK will be used."
+@@ -232,7 +232,7 @@ fi
+ 
+ 
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
++QT4_IM_DIR=$prefix/$LIB/qt4/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
+ if [ $? = 0 ]; then
+@@ -291,7 +291,7 @@ fi
+ 
+ bindir=$prefix/bin
+ datadir=$prefix/share
+-mandir=$datadir/man
++mandir=$prefix/man
+ libdir=$prefix/$LIB
+ includedir=$prefix/include
+ optdir=/opt
+@@ -322,9 +322,9 @@ if [ $QT4_IM = 'N' ]; then
+   mv gcin.spec gcin.spec.tmp
+   grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ else
+-  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
++  for i in %%MOC%% /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
+   do
+-    [ ! -x $i ] && continue
++    [ ! -x $i ] & continue
+     QT4_MOC=$i
+     echo "QT4_MOC=$QT4_MOC"
+     break
+@@ -347,7 +347,7 @@ else
+   cd ..
+   for i in /usr/share/qt5/bin/moc /usr/lib/qt5/bin/moc /usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc /usr/lib64/qt5/bin/moc /usr/bin/moc
+   do
+-    [ ! -x $i ] && continue
++    [ ! -x $i ] & continue
+     QT5_MOC=$i
+     echo "QT5_MOC=$QT5_MOC"
+     break
+@@ -356,7 +356,7 @@ fi
+ 
+ 
+ BUILD_MODULE='Y'
+-if [ $USE_ANTHY = 'Y' ] || [ $USE_CHEWING = 'Y' ]; then
++if [ $USE_ANTHY = 'Y' ]; then
+   BUILD_MODULE='Y'
+ fi
+ 
+@@ -382,7 +382,7 @@ echo "datadir_r=$datadir" >> config.mak
+ echo "libdir=\$(DESTDIR)$libdir" >> config.mak
+ echo "gcinlibdir=\$(DESTDIR)$gcinlibdir" >> config.mak
+ echo "includedir=\$(DESTDIR)$includedir" >> config.mak
+-echo "LDFLAGS=-Wl,--as-needed $GTKLDFLAGS -lX11 -ldl -lm" >> config.mak
++echo "LDFLAGS=-Wl,--as-needed $GTKLDFLAGS -lX11 -lm" >> config.mak
+ echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak
+ echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak
+ echo "GCIN_OGG_DIR=\$(datadir_r)/gcin/ogg" >> config.mak
+@@ -429,9 +429,15 @@ echo "USE_INDICATOR=$USE_INDICATOR" >> c
+ echo "USE_GCB=$use_gcb" >> config.mak
+ echo "BUILD_MODULE=$BUILD_MODULE" >> config.mak
+ echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak
+-[ $QT5_IM = 'Y' ] && echo "QT5_MOC=$QT5_MOC" >> config.mak
+-[ $QT4_IM = 'Y' ] && echo "QT4_MOC=$QT4_MOC" >> config.mak
+-[ $QT_IM = 'Y' ] && echo "QT_MOC=$QT_MOC" >> config.mak
++if [ $QT5_IM = 'Y' ]; then
++ echo "QT5_MOC=$QT5_MOC" >> config.mak
++fi
++if [ $QT4_IM = 'Y' ]; then
++ echo "QT4_MOC=$QT4_MOC" >> config.mak
++fi
++if [ $QT_IM = 'Y' ]; then
++ echo "QT_MOC=$QT_MOC" >> config.mak
++fi
+ 
+ echo "GCIN_DEBUG=0" >> config.mak
+ if [ $prefix = /usr/local ]; then
diff --git a/chinese/gcin/files/patch-gcb.cpp b/chinese/gcin/files/patch-gcb.cpp
new file mode 100644
index 000000000000..97336e1f66c6
--- /dev/null
+++ b/chinese/gcin/files/patch-gcb.cpp
@@ -0,0 +1,21 @@
+--- gcb.cpp.orig	2015-11-22 23:15:12 UTC
++++ gcb.cpp
+@@ -1,3 +1,4 @@
++#if USE_GCB
+ #include <stdlib.h>
+ #include "os-dep.h"
+ #include <gtk/gtk.h>
+@@ -6,6 +7,7 @@
+ #include "gcin.h"
+ #include "gcin-conf.h"
+ 
++void free_gcb();
+ static GtkWidget *mainwin;
+ static GtkClipboard *pclipboard_clipboard, *pclipboard_primary;
+ static GtkWidget **buttonArr;
+@@ -529,4 +531,4 @@ void free_gcb() {
+   g_free(buttonStr); buttonStr = NULL;
+   }
+ }
+-
++#endif
diff --git a/chinese/gcin/files/patch-tray-indicator.cpp b/chinese/gcin/files/patch-tray-indicator.cpp
new file mode 100644
index 000000000000..91fa980597a3
--- /dev/null
+++ b/chinese/gcin/files/patch-tray-indicator.cpp
@@ -0,0 +1,12 @@
+--- tray-indicator.cpp.orig	2016-10-20 17:07:12 UTC
++++ tray-indicator.cpp
+@@ -1,3 +1,4 @@
++#if USE_INDICATOR
+ #include "gcin.h"
+ #include "pho.h"
+ #include "gtab.h"
+@@ -300,3 +301,4 @@ void destroy_tray_indicator()
+   g_object_unref(indicator_state);  indicator_state = NULL;
+ #endif  
+ }
++#endif
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 1df6bb303327..4cd9512cafe1 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -5,6 +5,7 @@ bin/gcin-kbm-toggle
 bin/gcin-message
 bin/gcin-tools
 bin/gcin2tab
+bin/gtab-db-gen
 bin/gtab-merge
 bin/juyin-learn
 bin/phoa2d
@@ -132,7 +133,7 @@ share/icons/gcin/fcitx-wanfeng.png
 share/icons/gcin/full-simp.png
 share/icons/gcin/full-trad.png
 share/icons/gcin/gcb.png
-share/icons/gcin/gcin-tray.png
+share/icons/gcin/gcin_tray.png
 share/icons/gcin/gdayi3.png
 share/icons/gcin/german.png
 share/icons/gcin/greek.png