- Upgrade to 1.5.6

 - Add LICENSE

9 files changed, 75 insertions, 65 deletions

diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 88143c048f9d..c24924b57b87 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:  gcin
+# New ports collection makefile for:  zh-gcin
 # Date created:                   Feb 18 2004
 # Whom:                           Shen Chuan-Hsing
 #
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.4.5
-PORTREVISION=	3
+PORTVERSION=	1.5.6
 CATEGORIES=	chinese textproc gnome
 MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
 		http://ftp.twaren.net/local-distfiles/gcin/:main \
@@ -18,13 +17,13 @@ EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A traditional chinese input utility in X
 
-CONFLICTS=	zh-gcin-devel-[0-9]*
+LICENSE=	LGPL21
 
 USE_BZIP2=	YES
 HAS_CONFIGURE=	YES
 USE_GNOME=	gtk20
 USE_GMAKE=	YES
-USE_XORG=	xtst
+USE_XORG=	x11 xtst
 INSTALLS_ICONS=	YES
 USE_LDCONFIG=	YES
 OPTIONS=	ANTHY		"enable Japanese anthy IM module" off \
@@ -67,8 +66,6 @@ post-extract:
 	  	noseeadd.rb
 	@${REINPLACE_CMD} -e 's,cj.gtab,cj.gtab noseeing.gtab,' \
 		${WRKSRC}/data/Makefile
-	@${REINPLACE_CMD} -e 's,noseeing-inst,noseeing-inst noseeadd.rb,' \
-		${WRKSRC}/scripts/Makefile
 .endif
 
 post-patch:
@@ -86,11 +83,12 @@ post-patch:
 		${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/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/mozilla-firefox/firefox3/;' \
 		${WRKSRC}/scripts/html-browser
-	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
 	@${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},' \
diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo
index 78f16b727813..b29a305c263b 100644
--- a/chinese/gcin/distinfo
+++ b/chinese/gcin/distinfo
@@ -1,6 +1,4 @@
-MD5 (gcin-1.4.5.tar.bz2) = b7e5e40804b2a645ae64f4dedb2b3985
-SHA256 (gcin-1.4.5.tar.bz2) = 7f46c468d77c4e1f2bc64f94396007ffa546135b5f9e918854ce7879ef52d05a
-SIZE (gcin-1.4.5.tar.bz2) = 2880978
-MD5 (noseeing-12.tar.gz) = ac89cf9bc9ece68b9f287a222197b147
+SHA256 (gcin-1.5.6.tar.bz2) = ce7e7ef6cedcd0d9fce6c6cf03c4bcc87d157b7dfa82990b1b52585a39299086
+SIZE (gcin-1.5.6.tar.bz2) = 2833378
 SHA256 (noseeing-12.tar.gz) = 9082f50db64b9e2971873aca1607c45a8eb41e803b99f66bd239fd587e1ce19b
 SIZE (noseeing-12.tar.gz) = 416726
diff --git a/chinese/gcin/files/patch-eve.c b/chinese/gcin/files/patch-eve.c
deleted file mode 100644
index 01d505962e27..000000000000
--- a/chinese/gcin/files/patch-eve.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- eve.c.orig	2009-05-17 17:08:46.000000000 +0800
-+++ eve.c	2009-05-17 17:09:22.000000000 +0800
-@@ -595,9 +595,11 @@
- #endif
-     case 10:
-       break;
-+#if USE_ANTHY
-     case 12:
-       get_win_anthy_geom();
-       break;
-+#endif
-     default:
-       get_win_gtab_geom();
-       break;
diff --git a/chinese/gcin/files/patch-gcin.h b/chinese/gcin/files/patch-gcin.h
new file mode 100644
index 000000000000..1c92f3a330af
--- /dev/null
+++ b/chinese/gcin/files/patch-gcin.h
@@ -0,0 +1,17 @@
+--- gcin.h.bak	2010-06-18 08:54:14.000000000 +0800
++++ gcin.h	2011-02-08 12:13:27.000000000 +0800
+@@ -50,6 +50,14 @@
+ #define GTK_WIDGET_REALIZED gtk_widget_get_realized
+ #endif
+ 
++#if GTK_CHECK_VERSION(2, 22, 0)
++#define GDK_DISPLAY() (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))
++#endif
++
++#ifndef GTK_API_VERSION_2
++#define GDK_DISPLAY() (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))
++#endif
++
+ typedef enum {
+   GCIN_STATE_DISABLED = 0,
+   GCIN_STATE_ENG_FULL = 1,
diff --git a/chinese/gcin/files/patch-im-client-Makefile b/chinese/gcin/files/patch-im-client-Makefile
new file mode 100644
index 000000000000..c462b454cc67
--- /dev/null
+++ b/chinese/gcin/files/patch-im-client-Makefile
@@ -0,0 +1,11 @@
+--- im-client/Makefile.orig	2009-12-12 19:28:49.000000000 +0800
++++ im-client/Makefile	2010-11-20 18:09:18.000000000 +0800
+@@ -20,7 +20,7 @@
+ 	$(CC) -x c -c $(CFLAGS) $<
+ 
+ $(SOFILEVER):   $(OBJS)
+-	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -lX11 -o $@
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
+ 	ln -sf $(SOFILEVER) $(SOFILE)
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	$(MAKE) -C ../gtk-im
diff --git a/chinese/gcin/files/patch-im-srv.cpp b/chinese/gcin/files/patch-im-srv.cpp
new file mode 100644
index 000000000000..85dc4147e31b
--- /dev/null
+++ b/chinese/gcin/files/patch-im-srv.cpp
@@ -0,0 +1,11 @@
+--- im-srv.cpp~	2010-04-09 21:14:55.000000000 +0800
++++ im-srv.cpp	2011-01-29 14:11:47.000000000 +0800
+@@ -15,6 +15,8 @@
+ #include "gcin.h"
+ #include "gcin-protocol.h"
+ #include "im-srv.h"
++#include <gtk/gtk.h>
++#include <gdk/gdkx.h>
+ #include <gdk/gdk.h>
+ 
+ #if UNIX
diff --git a/chinese/gcin/files/patch-menu b/chinese/gcin/files/patch-menu
index ffe2df8dd9f4..e006c47ebdd9 100644
--- a/chinese/gcin/files/patch-menu
+++ b/chinese/gcin/files/patch-menu
@@ -1,11 +1,8 @@
---- menu/Makefile.bak	Mon Oct 30 12:44:59 2006
-+++ menu/Makefile	Mon Oct 30 12:43:10 2006
-@@ -10,14 +10,10 @@
- 	   install gcin-setup.desktop /usr/share/applications; \
- 	   install -d /usr/lib/menu; \
+--- menu/Makefile.bak	2010-11-19 04:16:50.000000000 +0800
++++ menu/Makefile	2010-11-19 04:18:35.000000000 +0800
+@@ -12,12 +12,8 @@
  	   install -m 644 $(MENUS) /usr/lib/menu; \
--	   which update-menus >& /dev/null && update-menus || exit 0; \
-+	   which update-menus > /dev/null 2>&1 && update-menus || exit 0; \
+ 	   which update-menus > /dev/null 2>&1 && update-menus || exit 0; \
  	else \
 -	   install -d $(libdir)/menu; \
 -	   install -m 644 $(MENUS) $(libdir)/menu; \
diff --git a/chinese/gcin/files/patch-qt4-im-Makefile b/chinese/gcin/files/patch-qt4-im-Makefile
index 8a9fa21a7034..ff75352b3090 100644
--- a/chinese/gcin/files/patch-qt4-im-Makefile
+++ b/chinese/gcin/files/patch-qt4-im-Makefile
@@ -1,33 +1,21 @@
---- qt4-im/Makefile.orig	2009-02-01 08:50:10.000000000 +0800
-+++ qt4-im/Makefile	2009-02-01 08:55:39.000000000 +0800
-@@ -1,29 +1,29 @@
+--- qt4-im/Makefile~	2010-07-29 00:15:03.000000000 +0800
++++ qt4-im/Makefile	2011-02-09 16:44:54.000000000 +0800
+@@ -1,21 +1,22 @@
  include ../config.mak
  QT=qt4
--QTIM=$(QT)/plugins/lib/inputmethods
+ QTIM=$(QT)/plugins/inputmethods
 -IMMODULES=$(libdir)/$(QTIM)
-+QTIM=$(QT)/plugins/inputmethods
 +IMMODULES=/usr/local/lib/$(QTIM)
- ifeq ($(LIB), lib64)
--	IMMODULES_LOCAL=/usr/$(LIB)/qt4/plugins/lib64/inputmethods
-+	IMMODULES_LOCAL=/usr/local/lib/qt4/plugins/lib64/inputmethods
- else
--	IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
-+	IMMODULES_LOCAL=$(IMMODULES)
- endif
--QTINC=/usr/lib/$(QT)/include
-+QTINC=/usr/local/include/$(QT)
  
--INCS=-I../im-client -I$(QTINC) -I/usr/include/X11 -I$(QTINC)/QtGui -I$(QTINC)/QtCore
-+INCS=-I../im-client -I$(QTINC) -I/usr/local/include -I$(QTINC)/QtGui -I$(QTINC)/QtCore
+-INCS=-I../im-client -I/usr/include/X11 `pkg-config QtCore QtGui --cflags`
++INCS=-I../im-client -I/usr/local/include `pkg-config QtCore QtGui --cflags`
  CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC  -DQT4 -DQT_SHARED \
  -DQT_IMMODULE -DPIC
  OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o
  .SUFFIXES:	.c .cpp .a .so .E .h
--LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
-+LDFLAGS=-L/usr/local/lib/$(QT) -L/usr/local/lib -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
- -lXrender -lXrandr  -lXft -lfontconfig -lgcin-im-client \
---lXext -lX11 -lm -lSM -lICE -ldl -lpthread
-+-lXext -lX11 -lm -lSM -lICE -lpthread
+-LDFLAGS=-L../im-client -lgcin-im-client -Wl,-rpath,$(gcinlibdir) `pkg-config QtCore QtGui --libs`
++LDFLAGS=-L../im-client -lgcin-im-client -lXext -lX11 -lm -lSM -lICE \
++	-lpthread -Wl,-rpath,$(gcinlibdir) `pkg-config QtCore QtGui --libs`
  all:    im-gcin.so
  
  .cpp.E:
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 2344ff68b17f..f69879bccf49 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -3,7 +3,6 @@ bin/gcin-gb-toggle
 bin/gcin-kbm-toggle
 bin/gcin-message
 bin/gcin-setup
-bin/gcin-setup-tab
 bin/gcin2tab
 bin/gtab-merge
 bin/juyin-learn
@@ -12,29 +11,29 @@ bin/phod2a
 bin/sim2trad
 bin/trad2sim
 bin/tsa2d32
-bin/tsd2a
 bin/tsd2a32
+bin/tsin2gtab-phrase
 bin/tslearn
-include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
-%%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so
+@comment %%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so
 lib/gcin1.so
 lib/gcin2.so
-lib/gtk_bug_fix.so
 lib/libgcin-im-client.so
-lib/libgcin-im-client.so.1.2.0
+lib/libgcin-im-client.so.1.2.2
 lib/libgcin-im-client.so.1
 %%DATADIR%%/script/gcin-user-setup
 %%DATADIR%%/script/gtab.append_prepare
 %%DATADIR%%/script/html-browser
-%%BOSHIAMY%%%%DATADIR%%/script/noseeadd.rb
-%%DATADIR%%/script/noseeing-inst
+@comment %%BOSHIAMY%%%%DATADIR%%/script/noseeadd.rb
+%%DATADIR%%/script/tsin-gtab-import
+%%DATADIR%%/script/tsin-gtab-edit
 %%DATADIR%%/script/utf8-edit
 %%DATADIR%%/table/ar30.gtab
 %%DATADIR%%/table/ar30-big.gtab
 %%DATADIR%%/table/cj-punc.gtab
 %%DATADIR%%/table/cj.gtab
 %%DATADIR%%/table/cj5.gtab
+%%DATADIR%%/table/cj543.gtab
 %%DATADIR%%/table/dayi3.gtab
 %%DATADIR%%/table/dvorak.kbm
 %%DATADIR%%/table/et-asdf.kbm
@@ -57,6 +56,7 @@ lib/libgcin-im-client.so.1
 %%DATADIR%%/table/pinyin.kbm
 %%DATADIR%%/table/pinyin-asdf.kbm
 %%DATADIR%%/table/pin-juyin.xlt
+%%DATADIR%%/table/russian.gtab
 %%DATADIR%%/table/s2t.dat
 %%DATADIR%%/table/simplex.gtab
 %%DATADIR%%/table/symbol-table
@@ -79,15 +79,21 @@ share/icons/gcin/cj-punc.png
 share/icons/gcin/cj.png
 share/icons/gcin/cj5.png
 share/icons/gcin/dayi3.png
+share/icons/gcin/en-kana-nippon.png
+share/icons/gcin/en-tsin.png
 share/icons/gcin/erbi.png
 share/icons/gcin/ez.png
 share/icons/gcin/fcitx-qxm.png
 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/gdayi3.png
 share/icons/gcin/greek.png
 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/intcode.png
 share/icons/gcin/jtcj_gb.png
@@ -111,8 +117,6 @@ share/icons/gcin/tsou-gcin.png
 share/icons/gcin/wm2.png
 share/icons/gcin/wubi.png
 share/icons/gcin.png
-share/icons/gcin/pin-fixed24.png
-share/icons/gcin/pin-float16.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/icons/gcin
 @dirrmtry share/icons