Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Nov 2010 22:24:46 +0800
From:      "Denise H. G." <darcsis@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/152615: [MAINTAINER] update chinese/fcitx to 4.0.0.
Message-ID:  <86fwumkfo1.fsf@pluton.xbsd.name>
Resent-Message-ID: <201011271450.oAREo21a042998@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         152615
>Category:       ports
>Synopsis:       [MAINTAINER] update chinese/fcitx to 4.0.0.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 27 14:50:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Denise H. G.
>Release:        FreeBSD 8.2-PRERELEASE amd64
>Organization:
XBSD Networks
>Environment:
System: FreeBSD pluton.xbsd.name 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Sat Nov 27 20:26:59 CST 2010 root@pluton.xbsd.name:/opt/obj/sysbld/usr/src/sys/pluton-amd64 amd64

>Description:

	new upstream release.

>How-To-Repeat:

	

>Fix:

	
--- fcitx.diff begins here ---
diff -nau fcitx.orig/Makefile fcitx/Makefile
--- fcitx.orig/Makefile	2010-11-27 22:07:05.990012706 +0800
+++ fcitx/Makefile	2010-11-27 22:02:00.827289401 +0800
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	3.6.3
+PORTVERSION=	4.0.0
 CATEGORIES=	chinese x11
-MASTER_SITES=	http://www.fcitx.org/download/ \
-		ftp://mirrors.redv.com/pub/fcitx/
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTFILES+=		pinyin.tar.gz table.tar.gz
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	A simple and fast GBK Chinese XIM server
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+DIST_SUBDIR=	fcitx
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_XORG=	xpm x11 xtst
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
@@ -50,10 +51,8 @@
 .endif
 
 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
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pinyin.tar.gz ${WRKSRC}/data
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/table.tar.gz ${WRKSRC}/data/table
 
 pre-install:
 	@${CHMOD} +x ${WRKSRC}/install-sh
diff -nau fcitx.orig/distinfo fcitx/distinfo
--- fcitx.orig/distinfo	2010-11-27 22:07:05.989017631 +0800
+++ fcitx/distinfo	2010-11-27 20:27:03.286789978 +0800
@@ -1,3 +1,7 @@
-MD5 (fcitx-3.6.3.tar.bz2) = b1da30c72374d7b3d70738493d44d300
-SHA256 (fcitx-3.6.3.tar.bz2) = e986f1223d758d57b87e74b75dd9b635366ee4bf6ea90779f5a48e44498de5b5
-SIZE (fcitx-3.6.3.tar.bz2) = 6385159
+SHA256 (fcitx/fcitx-4.0.0.tar.gz) = 750884e992f51d8557447dc02fe6ada9758392611fc3271849ed26eba33f2d1c
+SIZE (fcitx/fcitx-4.0.0.tar.gz) = 1357079
+SHA256 (fcitx/pinyin.tar.gz) = bf8c581450f9fac0eab0498927d1d5e5c1cd465ed9937e4d9362ca9d67920fa4
+SIZE (fcitx/pinyin.tar.gz) = 1613447
+SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
+SIZE(fcitx/table.tar.gz) = 4144686
+
Common subdirectories: fcitx.orig/files and fcitx/files
diff -nau fcitx.orig/pkg-plist fcitx/pkg-plist
--- fcitx.orig/pkg-plist	2010-11-27 22:07:05.989017631 +0800
+++ fcitx/pkg-plist	2010-11-27 21:57:39.114807275 +0800
@@ -1,51 +1,181 @@
 bin/createPYMB
 bin/fcitx
+bin/fcitx-config
 bin/fcitx-remote
-bin/jd2fcitx
 bin/mb2org
 bin/mb2txt
-bin/pyjj2fcitx
 bin/readPYBase
 bin/readPYMB
 bin/txt2mb
-bin/win2fcitx
+include/fcitx/im.h
+include/fcitx-config/fcitx-config.h
+include/fcitx-config/configfile.h
+include/fcitx-config/hotkey.h
+include/fcitx-config/profile.h
+include/fcitx-config/xdg.h
+share/pixmaps/fcitx/fcitx-wubi.png
+share/pixmaps/fcitx/fcitx-half-letter.png
+share/pixmaps/fcitx/fcitx-half-punct.png
+share/pixmaps/fcitx/fcitx-trad.png
+share/pixmaps/fcitx/fcitx-vkon.png
+share/pixmaps/fcitx/fcitx-ziranma.png
+share/pixmaps/fcitx/fcitx-vkoff.png
+share/pixmaps/fcitx/fcitx-erbi.png
+share/pixmaps/fcitx/fcitx-legend.png
+share/pixmaps/fcitx/fcitx-nolegend.png
+share/pixmaps/fcitx/fcitx.png
+share/pixmaps/fcitx/fcitx-full-punct.png
+share/pixmaps/fcitx/fcitx-cangjie.png
+share/pixmaps/fcitx/fcitx-pinyin.png
+share/pixmaps/fcitx/fcitx-full-letter.png
+share/pixmaps/fcitx/fcitx-eng.png
+share/pixmaps/fcitx/fcitx-chn.png
+share/pixmaps/fcitx/fcitx-simp.png
+lib/pkgconfig/fcitx-config.pc
+lib/pkgconfig/fcitx.pc
+lib/locale/zh_CN/LC_MESSAGES/fcitx.mo
+%%DATADIR%%/doc/wb_fh.htm
+%%DATADIR%%/doc/Develop_Readme
+%%DATADIR%%/doc/cjkvinput.txt
+%%DATADIR%%/doc/pinyin.txt
+%%DATADIR%%/doc/fcitx_trunk.doxyfile
+%%DATADIR%%/doc/API.txt
+%%DATADIR%%/doc/fcitx4.pdf
+%%DATADIR%%/data/profile.desc
+%%DATADIR%%/data/addon.desc
 %%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/vk.conf
 %%DATADIR%%/data/pybase.mb
+%%DATADIR%%/data/gbks2t.tab
 %%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
+%%DATADIR%%/data/pySym.mb
+%%DATADIR%%/data/punc.mb
+%%DATADIR%%/data/table.desc
+%%DATADIR%%/data/table/wbpy.conf
+%%DATADIR%%/data/table/wbx.mb
+%%DATADIR%%/data/table/db.mb
+%%DATADIR%%/data/table/wbx.conf
+%%DATADIR%%/data/table/wbpy.mb
+%%DATADIR%%/data/table/qxm.conf
+%%DATADIR%%/data/table/db.conf
+%%DATADIR%%/data/table/erbi.mb
+%%DATADIR%%/data/table/wanfeng.mb
+%%DATADIR%%/data/table/qxm.mb
+%%DATADIR%%/data/table/wanfeng.conf
+%%DATADIR%%/data/table/cangjie.conf
+%%DATADIR%%/data/table/disable-table.conf.template
+%%DATADIR%%/data/table/cj.mb
+%%DATADIR%%/data/table/zrm.mb
+%%DATADIR%%/data/table/erbi.conf
+%%DATADIR%%/data/table/zrm.conf
+%%DATADIR%%/data/config.desc
+%%DATADIR%%/data/skin.desc
+%%DATADIR%%/skin/default/next.png
+%%DATADIR%%/skin/default/fan.png
+%%DATADIR%%/skin/default/shuangpin.png
+%%DATADIR%%/skin/default/jian.png
+%%DATADIR%%/skin/default/menu.png
+%%DATADIR%%/skin/default/logo.png
+%%DATADIR%%/skin/default/cn.png
+%%DATADIR%%/skin/default/legend.png
+%%DATADIR%%/skin/default/ziranma.png
+%%DATADIR%%/skin/default/active.png
+%%DATADIR%%/skin/default/pinyin.png
+%%DATADIR%%/skin/default/fcitx_skin.conf
+%%DATADIR%%/skin/default/wubi.png
+%%DATADIR%%/skin/default/quwei.png
+%%DATADIR%%/skin/default/en.png
+%%DATADIR%%/skin/default/bar.png
+%%DATADIR%%/skin/default/prev.png
+%%DATADIR%%/skin/default/input.png
+%%DATADIR%%/skin/default/half.png
+%%DATADIR%%/skin/default/wanfeng.png
+%%DATADIR%%/skin/default/cangjie.png
+%%DATADIR%%/skin/default/bingchan.png
+%%DATADIR%%/skin/default/full.png
+%%DATADIR%%/skin/default/chnpunc.png
+%%DATADIR%%/skin/default/wbpy.png
+%%DATADIR%%/skin/default/novk.png
+%%DATADIR%%/skin/default/vk.png
+%%DATADIR%%/skin/default/nolegend.png
+%%DATADIR%%/skin/default/dianbaoma.png
+%%DATADIR%%/skin/default/erbi.png
+%%DATADIR%%/skin/default/engpunc.png
+%%DATADIR%%/skin/default/inactive.png
+%%DATADIR%%/skin/default/keyboard.png
+%%DATADIR%%/skin/classic/ziranma.png
+%%DATADIR%%/skin/classic/jian.png
+%%DATADIR%%/skin/classic/next.png
+%%DATADIR%%/skin/classic/dianbaoma.png
+%%DATADIR%%/skin/classic/vk.png
+%%DATADIR%%/skin/classic/logo.png
+%%DATADIR%%/skin/classic/fcitx_skin.conf
+%%DATADIR%%/skin/classic/menu.png
+%%DATADIR%%/skin/classic/input.png
+%%DATADIR%%/skin/classic/pinyin.png
+%%DATADIR%%/skin/classic/en.png
+%%DATADIR%%/skin/classic/bar.png
+%%DATADIR%%/skin/classic/active.png
+%%DATADIR%%/skin/classic/quwei.png
+%%DATADIR%%/skin/classic/legend.png
+%%DATADIR%%/skin/classic/cn.png
+%%DATADIR%%/skin/classic/prev.png
+%%DATADIR%%/skin/classic/chnpunc.png
+%%DATADIR%%/skin/classic/nolegend.png
+%%DATADIR%%/skin/classic/wubi.png
+%%DATADIR%%/skin/classic/half.png
+%%DATADIR%%/skin/classic/full.png
+%%DATADIR%%/skin/classic/inactive.png
+%%DATADIR%%/skin/classic/engpunc.png
+%%DATADIR%%/skin/classic/novk.png
+%%DATADIR%%/skin/classic/wbpy.png
+%%DATADIR%%/skin/classic/shuangpin.png
+%%DATADIR%%/skin/classic/wanfeng.png
+%%DATADIR%%/skin/classic/cangjie.png
+%%DATADIR%%/skin/classic/erbi.png
+%%DATADIR%%/skin/classic/fan.png
+%%DATADIR%%/skin/classic/bingchan.png
+%%DATADIR%%/skin/dark/wanfeng.png
+%%DATADIR%%/skin/dark/cangjie.png
+%%DATADIR%%/skin/dark/inactive.png
+%%DATADIR%%/skin/dark/dianbaoma.png
+%%DATADIR%%/skin/dark/nolegend.png
+%%DATADIR%%/skin/dark/cn.png
+%%DATADIR%%/skin/dark/bingchan.png
+%%DATADIR%%/skin/dark/next.png
+%%DATADIR%%/skin/dark/fan.png
+%%DATADIR%%/skin/dark/engpunc.png
+%%DATADIR%%/skin/dark/jian.png
+%%DATADIR%%/skin/dark/menu.png
+%%DATADIR%%/skin/dark/logo.png
+%%DATADIR%%/skin/dark/chnpunc.png
+%%DATADIR%%/skin/dark/wbpy.png
+%%DATADIR%%/skin/dark/novk.png
+%%DATADIR%%/skin/dark/vk.png
+%%DATADIR%%/skin/dark/erbi.png
+%%DATADIR%%/skin/dark/bar.png
+%%DATADIR%%/skin/dark/wubi.png
+%%DATADIR%%/skin/dark/active.png
+%%DATADIR%%/skin/dark/prev.png
+%%DATADIR%%/skin/dark/quwei.png
+%%DATADIR%%/skin/dark/fcitx_skin.conf
+%%DATADIR%%/skin/dark/legend.png
+%%DATADIR%%/skin/dark/input.png
+%%DATADIR%%/skin/dark/shuangpin.png
+%%DATADIR%%/skin/dark/ziranma.png
+%%DATADIR%%/skin/dark/en.png
+%%DATADIR%%/skin/dark/pinyin.png
+%%DATADIR%%/skin/dark/full.png
+%%DATADIR%%/skin/dark/half.png
+@dirrm %%DATADIR%%/skin/default
+@dirrm %%DATADIR%%/skin/dark
+@dirrm %%DATADIR%%/skin/classic
+@dirrm %%DATADIR%%/data/table
+@dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%
-%%DOCSDIR%%/API.txt
-%%DOCSDIR%%/Develop_Readme.GBK
-%%DOCSDIR%%/cjkvinput.txt
-%%DOCSDIR%%/fcitx3.pdf
-%%DOCSDIR%%/fcitx_trunk.doxyfile
-%%DOCSDIR%%/pinyin.txt
-%%DOCSDIR%%/wb_fh.htm
-@dirrm %%DOCSDIR%%
+@dirrm include/fcitx
+@dirrm include/fcitx-config
+@dirrm share/pixmaps/fcitx
--- fcitx.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86fwumkfo1.fsf>