- Update to 3.6.2

- Pass maintainership to submitter

PR:		ports/139692
Submitted by:	"Denise H. G." <darcsis@gmail.com>

5 files changed, 47 insertions, 28 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index d5c803cc9b6b..9936b3412c37 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -6,32 +6,33 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	3.5
-PORTREVISION=	1
+PORTVERSION=	3.6.2
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://www.fcitx.org/download/ \
 		ftp://mirrors.redv.com/pub/fcitx/ \
 		${MASTER_SITE_LOCAL} \
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	dryice
-DISTNAME= fcitx-3.5-BlackFri
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	darcsis@gmail.com
 COMMENT=	A simple and fast GBK Chinese XIM server
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_BZIP2=	yes
-USE_XORG=	xpm x11
+USE_XORG=	xpm x11 xtst
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-WRKSRC= 	${WRKDIR}/fcitx-${PORTVERSION}
+WRKSRC=		${WRKDIR}/fcitx-${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/src/xim.c
 	@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.eucCN#g' ${WRKSRC}/src/ui.c ${WRKSRC}/src/tools.c
 
+pre-install:
+	@${CHMOD} 0755 ${WRKSRC}/install-sh
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index 078d79014554..c4bbc8be5ad3 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,3 +1,3 @@
-MD5 (fcitx-3.5-BlackFri.tar.bz2) = a04233de3fb56fee6e583c2765616032
-SHA256 (fcitx-3.5-BlackFri.tar.bz2) = 07dfb11655097a15be57f38d33ef04c5db98adb7eb5c3326d9ed1acdf3bc80be
-SIZE (fcitx-3.5-BlackFri.tar.bz2) = 5719492
+MD5 (fcitx-3.6.2.tar.bz2) = 6a66cda4a8221f1d6685e5a400d8763e
+SHA256 (fcitx-3.6.2.tar.bz2) = 8f757cfb7e1611546f6e736424826c45c5811492d5fc1920ec9cbc6735210e08
+SIZE (fcitx-3.6.2.tar.bz2) = 6347362
diff --git a/chinese/fcitx/files/patch-doc-Makefile.in b/chinese/fcitx/files/patch-doc-Makefile.in
index e405a0ed11f9..c3fb7d658123 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	Fri Aug 11 00:40:27 2006
-+++ doc/Makefile.in	Wed Aug 23 12:44:19 2006
-@@ -148,7 +148,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- doc/Makefile.in.orig	2009-10-16 20:23:38.303051048 +0800
++++ doc/Makefile.in	2009-10-16 20:24:51.132275852 +0800
+@@ -141,7 +141,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(pkgdatadir)/doc
 +docdir = $(datadir)/doc/@PACKAGE@
- doc_DATA = \
-         cjkvinput.txt wb_fh.htm fcitx3.pdf pinyin.txt
- 
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/chinese/fcitx/files/patch-xpm-Makefile.in b/chinese/fcitx/files/patch-xpm-Makefile.in
index 698d8d088207..9f03cb21a476 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	Wed Aug 23 12:45:40 2006
-+++ xpm/Makefile.in	Wed Aug 23 12:45:08 2006
-@@ -148,7 +148,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- xpm/Makefile.in.orig	2009-10-08 22:08:06.000000000 +0800
++++ xpm/Makefile.in	2009-10-16 20:26:46.697277419 +0800
+@@ -172,7 +172,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -xpmdir = $(pkgdatadir)/xpm
-+xpmdir = 
- xpm_DATA = 
- EXTRA_DIST = $(xpm_DATA)
- all: all-am
++xpmdir =
+ xpm_DATA = about_icon.xpm chnPunc.xpm engPunc.xpm ft-0.xpm ft-1.xpm \
+ 	fullcorner.xpm gbk-0.xpm gbk-1.xpm halfcorner.xpm lock-0.xpm \
+ 	lock-1.xpm logo.xpm lx-0.xpm lx-1.xpm next.xpm prev.xpm vk-1.xpm vk.xpm
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 64393d4bdb8c..d75d764db95b 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -10,24 +10,42 @@ bin/txt2mb
 bin/win2fcitx
 %%DATADIR%%/data/AutoEng.dat
 %%DATADIR%%/data/cj.mb
+%%DATADIR%%/data/cj.txt
 %%DATADIR%%/data/config
+%%DATADIR%%/data/db.mb
+%%DATADIR%%/data/db.txt
 %%DATADIR%%/data/erbi.mb
+%%DATADIR%%/data/erbi.txt
+%%DATADIR%%/data/gbkpy.org
 %%DATADIR%%/data/gbks2t.tab
 %%DATADIR%%/data/punc.mb
+%%DATADIR%%/data/pyPhrase.org
 %%DATADIR%%/data/pySym.mb
 %%DATADIR%%/data/pybase.mb
 %%DATADIR%%/data/pyphrase.mb
 %%DATADIR%%/data/qxm.mb
+%%DATADIR%%/data/qxm.txt
 %%DATADIR%%/data/sp.dat
 %%DATADIR%%/data/tables.conf
 %%DATADIR%%/data/vk.conf
 %%DATADIR%%/data/wanfeng.mb
+%%DATADIR%%/data/wanfeng.txt
 %%DATADIR%%/data/wbpy.mb
+%%DATADIR%%/data/wbpy.txt
 %%DATADIR%%/data/wbx.mb
+%%DATADIR%%/data/wbx.txt
+%%DATADIR%%/data/zrm.mb
+%%DATADIR%%/data/zrm.txt
+%%DATADIR%%/tools/winmb2fcitx.py
 @dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%
+%%DOCSDIR%%/API.txt
+%%DOCSDIR%%/Develop_Readme.GBK
 %%DOCSDIR%%/cjkvinput.txt
+%%DOCSDIR%%/fcitx3.odt
 %%DOCSDIR%%/fcitx3.pdf
+%%DOCSDIR%%/fcitx_trunk.doxyfile
 %%DOCSDIR%%/pinyin.txt
 %%DOCSDIR%%/wb_fh.htm
 @dirrm %%DOCSDIR%%