1: fix pkg-plist

2: fix build with qt4.

Submitted by:	swills@ [1], kevlo@ [2]

3 files changed, 30 insertions, 19 deletions

diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 65e72780bb3b..ac83ec08f7af 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcin
 PORTVERSION=	2.8.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://hyperrate.com/gcin-source/
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.xz
diff --git a/chinese/gcin/files/patch-qt4-im__Makefile b/chinese/gcin/files/patch-qt4-im__Makefile
index 3a3d6ed21240..a8f8c4415248 100644
--- a/chinese/gcin/files/patch-qt4-im__Makefile
+++ b/chinese/gcin/files/patch-qt4-im__Makefile
@@ -1,11 +1,11 @@
 --- qt4-im/Makefile.orig	2012-03-05 20:26:54.000000000 +0800
-+++ qt4-im/Makefile	2014-04-12 11:02:12.447548888 +0800
++++ qt4-im/Makefile	2014-04-17 17:21:30.838404919 +0800
 @@ -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/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
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 3da41ad7c2d9..acb35fa7eb29 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -12,21 +12,23 @@ bin/phod2a
 bin/sim2trad
 bin/trad2sim
 bin/ts-contribute
+bin/ts-contribute-en
 bin/ts-edit
+bin/ts-edit-en
 bin/tsa2d32
 bin/tsd2a32
 bin/tsin2gtab-phrase
 bin/tslearn
 bin/txt2gtab-phrase
-lib/gtk-2.0/immodules/im-gcin.so
 %%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so
 %%ANTHY_MODULE%%lib/gcin/anthy-module.so
 lib/gcin/gcin1.so
 lib/gcin/gcin2.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
+lib/gcin/libgcin-im-client.so.1.2.5
+lib/gtk-2.0/immodules/im-gcin.so
 man/man1/gcin-exit.1.gz
 man/man1/gcin-gb-toggle.1.gz
 man/man1/gcin-kbm-toggle.1.gz
@@ -42,17 +44,21 @@ man/man1/ts-contribute.1.gz
 man/man1/ts-edit.1.gz
 man/man1/tsa2d32.1.gz
 man/man1/tslearn.1.gz
+share/applications/gcin-tools.desktop
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/README.html
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/gtab.append_prepare
 %%DATADIR%%/script/html-browser
-%%DATADIR%%/script/tsin-gtab-import
 %%DATADIR%%/script/tsin-gtab-edit
+%%DATADIR%%/script/tsin-gtab-import
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/NewCJ3.gtab
-%%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/ar30-big.gtab
+%%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/ar33.gtab
 %%DATADIR%%/table/array-symbols.gtab
+%%DATADIR%%/table/array10a.gtab
 %%DATADIR%%/table/cj-punc.gtab
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
@@ -60,34 +66,37 @@ man/man1/tslearn.1.gz
 %%DATADIR%%/table/colemak.kbm
 %%DATADIR%%/table/dayi3.gtab
 %%DATADIR%%/table/dvorak.kbm
+%%DATADIR%%/table/en-american
+%%DATADIR%%/table/en-american.idx
 %%DATADIR%%/table/et.kbm
 %%DATADIR%%/table/et26.kbm
 %%DATADIR%%/table/german.gtab
 %%DATADIR%%/table/greek.gtab
 %%DATADIR%%/table/gtab.list
-%%DATADIR%%/table/hangul.gtab
 %%DATADIR%%/table/hangul-phrase.txt
+%%DATADIR%%/table/hangul.gtab
 %%DATADIR%%/table/hsu.kbm
 %%DATADIR%%/table/ibm.kbm
 %%DATADIR%%/table/jyutping.gtab
 %%DATADIR%%/table/latin-letters.gtab
 %%DATADIR%%/table/mitac.kbm
-%%DATADIR%%/table/phrase-ctrl.table
+%%DATADIR%%/table/pho-char.gtab
 %%DATADIR%%/table/pho-huge.tab2
 %%DATADIR%%/table/pho.tab2
+%%DATADIR%%/table/phrase-ctrl.table
 %%DATADIR%%/table/phrase.table
+%%DATADIR%%/table/pin-juyin.xlt
+%%DATADIR%%/table/pinyin-no-tone.kbm
 %%DATADIR%%/table/pinyin.gtab
 %%DATADIR%%/table/pinyin.kbm
-%%DATADIR%%/table/pinyin-no-tone.kbm
-%%DATADIR%%/table/pin-juyin.xlt
 %%DATADIR%%/table/russian.gtab
 %%DATADIR%%/table/s-pho-huge.tab2
 %%DATADIR%%/table/s-pho.tab2
 %%DATADIR%%/table/s-tsin32
 %%DATADIR%%/table/s-tsin32.idx
 %%DATADIR%%/table/s2t.dat
-%%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/simplex-punc.gtab
+%%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/symbol-table
 %%DATADIR%%/table/symbols.gtab
 %%DATADIR%%/table/t2s.dat
@@ -96,24 +105,25 @@ man/man1/tslearn.1.gz
 %%DATADIR%%/table/tsin32.idx
 %%DATADIR%%/table/vims.gtab
 %%DATADIR%%/table/zo.kbm
-%%PORTDOCS%%%%DOCSDIR%%/Changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-share/applications/gcin-tools.desktop
-share/icons/gcin/NewCJ3.png
 share/icons/gcin/4corner.png
+share/icons/gcin/NewCJ3.png
 share/icons/gcin/amis-gcin.png
-share/icons/gcin/ar30.png
 share/icons/gcin/ar30-big.png
+share/icons/gcin/ar30.png
 share/icons/gcin/ar33.png
 share/icons/gcin/array-symbols.png
+share/icons/gcin/chewing.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-gcin-A.png
+share/icons/gcin/en-gcin.png
+share/icons/gcin/en-gtab-A.png
 share/icons/gcin/en-gtab.png
 share/icons/gcin/en-kana-nippon.png
+share/icons/gcin/en-tsin-A.png
 share/icons/gcin/en-tsin.png
 share/icons/gcin/erbi.png
 share/icons/gcin/ez.png
@@ -140,13 +150,14 @@ share/icons/gcin/latin-letters.png
 share/icons/gcin/newcj.png
 share/icons/gcin/noseeing.png
 share/icons/gcin/paiwan-gcin.png
+share/icons/gcin/pho-char.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/simplex.png
 share/icons/gcin/symbol_table.png
 share/icons/gcin/symbols.png
 share/icons/gcin/taiwan.png