Upgrade to 3.2

PR:		ports/98921
Submitted by:	maintainer

6 files changed, 24 insertions, 50 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index f174f199bbf7..f6ee13e882be 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	3.1.1
+PORTVERSION=	3.2
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://www.fcitx.org/download/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
-EXTRACT_SUFX=	.tar.bz2
+#EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	dryice@dryice.name
 COMMENT=	A simple and fast GBK Chinese XIM server
@@ -21,6 +21,7 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/src/xim.c
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index 98a0739c25c5..433cd04638c9 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,3 +1,3 @@
-MD5 (fcitx-3.1.1.tar.bz2) = cd871c585dc260ebf48e2bdb5cbe596c
-SHA256 (fcitx-3.1.1.tar.bz2) = 011863a2964e64b89f2eabf1f98bed2caf8201e4a998847ffff55098dc7dadaa
-SIZE (fcitx-3.1.1.tar.bz2) = 2920856
+MD5 (fcitx-3.2.tar.bz2) = 36514e2b6b592b592c7d4fcbed82d78e
+SHA256 (fcitx-3.2.tar.bz2) = e15d4a82c44cccaef623a8e20e502eb59abbbc8661936cee93b5b943ca3ccb8a
+SIZE (fcitx-3.2.tar.bz2) = 4167299
diff --git a/chinese/fcitx/files/patch-doc-Makefile.in b/chinese/fcitx/files/patch-doc-Makefile.in
index 9f2ef7cc148a..5428af110565 100644
--- a/chinese/fcitx/files/patch-doc-Makefile.in
+++ b/chinese/fcitx/files/patch-doc-Makefile.in
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Wed Oct 27 22:57:42 2004
-+++ doc/Makefile.in	Wed Oct 27 23:06:38 2004
-@@ -147,7 +147,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- doc/Makefile.in.orig	Tue Jun  6 22:17:38 2006
++++ doc/Makefile.in	Wed Jun 14 10:42:58 2006
+@@ -90,7 +90,7 @@
+ install_sh = @install_sh@
+ mkdir_p = @mkdir_p@
+ 
 -docdir = $(pkgdatadir)/doc
 +docdir = $(datadir)/doc/@PACKAGE@
- doc_DATA = \
-         cjkvinput.txt wb_fh.htm fcitx3.pdf
+ doc_DATA =          cjkvinput.txt wb_fh.htm fcitx3.pdf pinyin.txt
  
+ EXTRA_DIST = $(doc_DATA)
diff --git a/chinese/fcitx/files/patch-src-ui.c b/chinese/fcitx/files/patch-src-ui.c
deleted file mode 100644
index f86dc9de1d62..000000000000
--- a/chinese/fcitx/files/patch-src-ui.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/ui.c.orig	Wed Feb 23 03:34:39 2005
-+++ src/ui.c	Wed Mar  2 09:53:26 2005
-@@ -361,7 +361,7 @@
-     l2 = 99;
-     ps = str1;
- 
--    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
-+    l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
-     *ps = '\0';
-     XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str1, strlen (str1), &extents);
-     if (font == xftMainWindowFont)
-@@ -386,7 +386,7 @@
-     ps2 = str2;
-     ps1 = str1;
- 
--    l1 = iconv (convUTF8, &ps1, &l1, &ps2, &l2);
-+    l1 = iconv (convUTF8, (const char**) &ps1, &l1, &ps2, &l2);
-     *ps2 = '\0';
- 
-     XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str2, strlen (str2), &extents);
-@@ -439,7 +439,7 @@
-     l1 = strlen (str);
-     l2 = 99;
-     ps = strOutput;
--    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
-+    l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
-     *ps = '\0';
- 
-     renderColor.red = color.red;
diff --git a/chinese/fcitx/files/patch-xpm-Makefile.in b/chinese/fcitx/files/patch-xpm-Makefile.in
index 3ddad8792788..59ac0767cae4 100644
--- a/chinese/fcitx/files/patch-xpm-Makefile.in
+++ b/chinese/fcitx/files/patch-xpm-Makefile.in
@@ -1,11 +1,11 @@
---- xpm/Makefile.in.orig	Mon Jan 17 20:56:42 2005
-+++ xpm/Makefile.in	Wed Feb 23 12:25:47 2005
-@@ -147,7 +147,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- xpm/Makefile.in.orig	Tue Jun  6 22:17:38 2006
++++ xpm/Makefile.in	Wed Jun 14 10:47:39 2006
+@@ -90,7 +90,7 @@
+ install_sh = @install_sh@
+ mkdir_p = @mkdir_p@
+ 
 -xpmdir = $(pkgdatadir)/xpm
-+xpmdir =
++xpmdir = 
  xpm_DATA = 
  EXTRA_DIST = $(xpm_DATA)
- all: all-am
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 238fe3e6f34c..7eba49c9c166 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -10,10 +10,12 @@ bin/txt2mb
 %%DATADIR%%/data/pyphrase.mb
 %%DATADIR%%/data/sp.dat
 %%DATADIR%%/data/tables.conf
+%%DATADIR%%/data/vk.conf
 %%DATADIR%%/data/wbx.mb
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
 %%DOCSDIR%%/cjkvinput.txt
 %%DOCSDIR%%/fcitx3.pdf
+%%DOCSDIR%%/pinyin.txt
 %%DOCSDIR%%/wb_fh.htm
 @dirrm %%DOCSDIR%%