Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Nov 2010 00:07:16 +0800
From:      darcsis@gmail.com (Denise H. G.)
To:        pav@freebsd.org
Cc:        freebsd-ports-bugs@freebsd.org
Subject:   Re: ports/152615: [MAINTAINER] update chinese/fcitx to 4.0.0.
Message-ID:  <86bp582jwr.fsf@pluton.xbsd.name>
In-Reply-To: <201011291016.oATAG7Xw099031@freefall.freebsd.org> (pav@freebsd.org's message of "Mon, 29 Nov 2010 10:16:07 GMT")
References:  <201011291016.oATAG7Xw099031@freefall.freebsd.org>

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


Hi

I've fixed the installation of .pc files and .mo files, and added some
missing configure args according to the upstream install docs. I've
included everything in a shar archive. Thanks for your attention!

--=-=-=
Content-Disposition: inline; filename=fcitx.shar
Content-Description: fcitx.shar

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	fcitx
#	fcitx/pkg-message
#	fcitx/pkg-plist
#	fcitx/pkg-descr
#	fcitx/files
#	fcitx/files/patch-data-Makefile.in
#	fcitx/files/patch-src-fcitx_config-Makefile.in
#	fcitx/files/patch-data-table-Makefile.in
#	fcitx/files/patch-src-core-Makefile.in
#	fcitx/files/patch-configure
#	fcitx/files/patch-png-Makefile.in
#	fcitx/Makefile
#	fcitx/distinfo
#
echo c - fcitx
mkdir -p fcitx > /dev/null 2>&1
echo x - fcitx/pkg-message
sed 's/^X//' >fcitx/pkg-message << '8c63c681fe56e6a14239f51ffdae5d0a'
X* * * * * * * * * * * * * * * * * * * * * * * * * * * *
X*   Remember to set environment variable XMODIFIERS:  *
X*	csh/tcsh: setenv XMODIFIERS @im=fcitx	      *
X*	sh/bash:  export XMODIFIERS='@im=fcitx'	      *
X*                                                     *
X*   For GTK/Qt programs, you might also want to set   *
X*      GTK_IM_MODULE=xim and/or QT_IM_MODULE=xim      *
X* * * * * * * * * * * * * * * * * * * * * * * * * * * *
8c63c681fe56e6a14239f51ffdae5d0a
echo x - fcitx/pkg-plist
sed 's/^X//' >fcitx/pkg-plist << '96620135545c718332e5842ce3367e82'
Xbin/createPYMB
Xbin/fcitx
Xbin/fcitx-config
Xbin/fcitx-remote
Xbin/mb2org
Xbin/mb2txt
Xbin/readPYBase
Xbin/readPYMB
Xbin/txt2mb
Xinclude/fcitx/im.h
Xinclude/fcitx-config/fcitx-config.h
Xinclude/fcitx-config/configfile.h
Xinclude/fcitx-config/hotkey.h
Xinclude/fcitx-config/profile.h
Xinclude/fcitx-config/xdg.h
Xshare/pixmaps/fcitx/fcitx-wubi.png
Xshare/pixmaps/fcitx/fcitx-half-letter.png
Xshare/pixmaps/fcitx/fcitx-half-punct.png
Xshare/pixmaps/fcitx/fcitx-trad.png
Xshare/pixmaps/fcitx/fcitx-vkon.png
Xshare/pixmaps/fcitx/fcitx-ziranma.png
Xshare/pixmaps/fcitx/fcitx-vkoff.png
Xshare/pixmaps/fcitx/fcitx-erbi.png
Xshare/pixmaps/fcitx/fcitx-legend.png
Xshare/pixmaps/fcitx/fcitx-nolegend.png
Xshare/pixmaps/fcitx/fcitx.png
Xshare/pixmaps/fcitx/fcitx-full-punct.png
Xshare/pixmaps/fcitx/fcitx-cangjie.png
Xshare/pixmaps/fcitx/fcitx-pinyin.png
Xshare/pixmaps/fcitx/fcitx-full-letter.png
Xshare/pixmaps/fcitx/fcitx-eng.png
Xshare/pixmaps/fcitx/fcitx-chn.png
Xshare/pixmaps/fcitx/fcitx-simp.png
Xshare/locale/zh_CN/LC_MESSAGES/fcitx.mo
Xlibdata/pkgconfig/fcitx-config.pc
Xlibdata/pkgconfig/fcitx.pc
X%%DATADIR%%/doc/wb_fh.htm
X%%DATADIR%%/doc/Develop_Readme
X%%DATADIR%%/doc/cjkvinput.txt
X%%DATADIR%%/doc/pinyin.txt
X%%DATADIR%%/doc/fcitx_trunk.doxyfile
X%%DATADIR%%/doc/API.txt
X%%DATADIR%%/doc/fcitx4.pdf
X%%DATADIR%%/data/profile.desc
X%%DATADIR%%/data/addon.desc
X%%DATADIR%%/data/AutoEng.dat
X%%DATADIR%%/data/vk.conf
X%%DATADIR%%/data/pybase.mb
X%%DATADIR%%/data/gbks2t.tab
X%%DATADIR%%/data/pyphrase.mb
X%%DATADIR%%/data/sp.dat
X%%DATADIR%%/data/pySym.mb
X%%DATADIR%%/data/punc.mb
X%%DATADIR%%/data/table.desc
X%%DATADIR%%/data/table/wbpy.conf
X%%DATADIR%%/data/table/wbx.mb
X%%DATADIR%%/data/table/db.mb
X%%DATADIR%%/data/table/wbx.conf
X%%DATADIR%%/data/table/wbpy.mb
X%%DATADIR%%/data/table/qxm.conf
X%%DATADIR%%/data/table/db.conf
X%%DATADIR%%/data/table/erbi.mb
X%%DATADIR%%/data/table/wanfeng.mb
X%%DATADIR%%/data/table/qxm.mb
X%%DATADIR%%/data/table/wanfeng.conf
X%%DATADIR%%/data/table/cangjie.conf
X%%DATADIR%%/data/table/disable-table.conf.template
X%%DATADIR%%/data/table/cj.mb
X%%DATADIR%%/data/table/zrm.mb
X%%DATADIR%%/data/table/erbi.conf
X%%DATADIR%%/data/table/zrm.conf
X%%DATADIR%%/data/config.desc
X%%DATADIR%%/data/skin.desc
X%%DATADIR%%/skin/default/next.png
X%%DATADIR%%/skin/default/fan.png
X%%DATADIR%%/skin/default/shuangpin.png
X%%DATADIR%%/skin/default/jian.png
X%%DATADIR%%/skin/default/menu.png
X%%DATADIR%%/skin/default/logo.png
X%%DATADIR%%/skin/default/cn.png
X%%DATADIR%%/skin/default/legend.png
X%%DATADIR%%/skin/default/ziranma.png
X%%DATADIR%%/skin/default/active.png
X%%DATADIR%%/skin/default/pinyin.png
X%%DATADIR%%/skin/default/fcitx_skin.conf
X%%DATADIR%%/skin/default/wubi.png
X%%DATADIR%%/skin/default/quwei.png
X%%DATADIR%%/skin/default/en.png
X%%DATADIR%%/skin/default/bar.png
X%%DATADIR%%/skin/default/prev.png
X%%DATADIR%%/skin/default/input.png
X%%DATADIR%%/skin/default/half.png
X%%DATADIR%%/skin/default/wanfeng.png
X%%DATADIR%%/skin/default/cangjie.png
X%%DATADIR%%/skin/default/bingchan.png
X%%DATADIR%%/skin/default/full.png
X%%DATADIR%%/skin/default/chnpunc.png
X%%DATADIR%%/skin/default/wbpy.png
X%%DATADIR%%/skin/default/novk.png
X%%DATADIR%%/skin/default/vk.png
X%%DATADIR%%/skin/default/nolegend.png
X%%DATADIR%%/skin/default/dianbaoma.png
X%%DATADIR%%/skin/default/erbi.png
X%%DATADIR%%/skin/default/engpunc.png
X%%DATADIR%%/skin/default/inactive.png
X%%DATADIR%%/skin/default/keyboard.png
X%%DATADIR%%/skin/classic/ziranma.png
X%%DATADIR%%/skin/classic/jian.png
X%%DATADIR%%/skin/classic/next.png
X%%DATADIR%%/skin/classic/dianbaoma.png
X%%DATADIR%%/skin/classic/vk.png
X%%DATADIR%%/skin/classic/logo.png
X%%DATADIR%%/skin/classic/fcitx_skin.conf
X%%DATADIR%%/skin/classic/menu.png
X%%DATADIR%%/skin/classic/input.png
X%%DATADIR%%/skin/classic/pinyin.png
X%%DATADIR%%/skin/classic/en.png
X%%DATADIR%%/skin/classic/bar.png
X%%DATADIR%%/skin/classic/active.png
X%%DATADIR%%/skin/classic/quwei.png
X%%DATADIR%%/skin/classic/legend.png
X%%DATADIR%%/skin/classic/cn.png
X%%DATADIR%%/skin/classic/prev.png
X%%DATADIR%%/skin/classic/chnpunc.png
X%%DATADIR%%/skin/classic/nolegend.png
X%%DATADIR%%/skin/classic/wubi.png
X%%DATADIR%%/skin/classic/half.png
X%%DATADIR%%/skin/classic/full.png
X%%DATADIR%%/skin/classic/inactive.png
X%%DATADIR%%/skin/classic/engpunc.png
X%%DATADIR%%/skin/classic/novk.png
X%%DATADIR%%/skin/classic/wbpy.png
X%%DATADIR%%/skin/classic/shuangpin.png
X%%DATADIR%%/skin/classic/wanfeng.png
X%%DATADIR%%/skin/classic/cangjie.png
X%%DATADIR%%/skin/classic/erbi.png
X%%DATADIR%%/skin/classic/fan.png
X%%DATADIR%%/skin/classic/bingchan.png
X%%DATADIR%%/skin/dark/wanfeng.png
X%%DATADIR%%/skin/dark/cangjie.png
X%%DATADIR%%/skin/dark/inactive.png
X%%DATADIR%%/skin/dark/dianbaoma.png
X%%DATADIR%%/skin/dark/nolegend.png
X%%DATADIR%%/skin/dark/cn.png
X%%DATADIR%%/skin/dark/bingchan.png
X%%DATADIR%%/skin/dark/next.png
X%%DATADIR%%/skin/dark/fan.png
X%%DATADIR%%/skin/dark/engpunc.png
X%%DATADIR%%/skin/dark/jian.png
X%%DATADIR%%/skin/dark/menu.png
X%%DATADIR%%/skin/dark/logo.png
X%%DATADIR%%/skin/dark/chnpunc.png
X%%DATADIR%%/skin/dark/wbpy.png
X%%DATADIR%%/skin/dark/novk.png
X%%DATADIR%%/skin/dark/vk.png
X%%DATADIR%%/skin/dark/erbi.png
X%%DATADIR%%/skin/dark/bar.png
X%%DATADIR%%/skin/dark/wubi.png
X%%DATADIR%%/skin/dark/active.png
X%%DATADIR%%/skin/dark/prev.png
X%%DATADIR%%/skin/dark/quwei.png
X%%DATADIR%%/skin/dark/fcitx_skin.conf
X%%DATADIR%%/skin/dark/legend.png
X%%DATADIR%%/skin/dark/input.png
X%%DATADIR%%/skin/dark/shuangpin.png
X%%DATADIR%%/skin/dark/ziranma.png
X%%DATADIR%%/skin/dark/en.png
X%%DATADIR%%/skin/dark/pinyin.png
X%%DATADIR%%/skin/dark/full.png
X%%DATADIR%%/skin/dark/half.png
X@dirrm %%DATADIR%%/skin/default
X@dirrm %%DATADIR%%/skin/dark
X@dirrm %%DATADIR%%/skin/classic
X@dirrm %%DATADIR%%/data/table
X@dirrm %%DATADIR%%/skin
X@dirrm %%DATADIR%%/doc
X@dirrm %%DATADIR%%/data
X@dirrm %%DATADIR%%
X@dirrm include/fcitx
X@dirrm include/fcitx-config
X@dirrm share/pixmaps/fcitx
96620135545c718332e5842ce3367e82
echo x - fcitx/pkg-descr
sed 's/^X//' >fcitx/pkg-descr << '4f4b0e74be48887537b48704fd567dab'
XFcitx is a simple and fast GBK Chinese XIM server.  It stands for Free
XChinese Input Toy for X, an input method for Unix-like operating systems.
XTo be more precise, it is a collection of Simplified Chinese input methods
Xbased on XIM (X Input Method), including WuBi, PinYin, and QuWei, and is
Xdistributed under GPL.  It is the descendent of gWuBi.
X
XWWW: http://www.fcitx.org/
4f4b0e74be48887537b48704fd567dab
echo c - fcitx/files
mkdir -p fcitx/files > /dev/null 2>&1
echo x - fcitx/files/patch-data-Makefile.in
sed 's/^X//' >fcitx/files/patch-data-Makefile.in << '6a408b823acb06e5e853fb11e947d4af'
X--- data/Makefile.in.orig	2010-11-27 20:20:50.990507459 +0800
X+++ data/Makefile.in	2010-11-27 20:21:11.099145804 +0800
X@@ -702,16 +702,9 @@
X tools: 
X 	$(MAKE) -C ../tools
X 
X-$(pyorg_data): $(py_tar) md5check
X+$(pyorg_data):
X 	cd $(srcdir) && $(TAR) xzvf $(py_tar)
X 
X-$(py_tar):
X-	$(WGET) -O $(py_tar) $(py_url)
X-	$(WGET) -O $(py_tar).md5 $(py_url).md5
X-
X-md5check: $(py_tar)
X-	cd $(srcdir) && $(MD5SUM) -c $(py_tar).md5 || ( $(RM) $(py_tar); exit 1 )
X-
X all-local: tools  $(py_data)
X 	rm -f pyERROR
X 	rm -f pyPhrase.ok
6a408b823acb06e5e853fb11e947d4af
echo x - fcitx/files/patch-src-fcitx_config-Makefile.in
sed 's/^X//' >fcitx/files/patch-src-fcitx_config-Makefile.in << 'dd243319e2ca0fd7b27854e9c9195e62'
X--- src/fcitx-config/Makefile.in.orig	2010-11-29 23:24:37.995657941 +0800
X+++ src/fcitx-config/Makefile.in	2010-11-29 23:25:13.265959780 +0800
X@@ -277,7 +277,7 @@
X 								hotkey.h \
X 								xdg.h
X 
X-pkgconfigdir = $(libdir)/pkgconfig
X+pkgconfigdir = $(prefix)/libdata/pkgconfig
X pkgconfig_DATA = fcitx-config.pc
X EXTRA_DIST = \
X 	fcitx-config.pc.in
dd243319e2ca0fd7b27854e9c9195e62
echo x - fcitx/files/patch-data-table-Makefile.in
sed 's/^X//' >fcitx/files/patch-data-table-Makefile.in << '5993e33eb4903f09e5204c5a28c3cdb1'
X--- data/table/Makefile.in.orig	2010-11-27 19:49:38.241629454 +0800
X+++ data/table/Makefile.in	2010-11-27 19:50:12.259003812 +0800
X@@ -487,16 +487,9 @@
X 
X $(txt_m_data): cj.txt ;
X 
X-cj.txt: $(table_tar) md5check
X+cj.txt:
X 	$(TAR) xzvf $(table_tar)
X 
X-$(table_tar):
X-	$(WGET) -O $(table_tar) $(table_url)
X-	$(WGET) -O $(table_tar).md5 $(table_url).md5
X-
X-md5check: $(table_tar)
X-	cd $(srcdir) && $(MD5SUM) -c $(table_tar).md5 || ( $(RM) $(table_tar); exit 1)
X-
X all-local: tools $(txt_data) $(mb_data)
X 
X # Tell versions [3.59,3.63) of GNU make to not export all variables.
5993e33eb4903f09e5204c5a28c3cdb1
echo x - fcitx/files/patch-src-core-Makefile.in
sed 's/^X//' >fcitx/files/patch-src-core-Makefile.in << '391c709e4f947ee4f6042adb718a6ee5'
X--- src/core/Makefile.in.orig	2010-11-29 23:26:13.597770436 +0800
X+++ src/core/Makefile.in	2010-11-29 23:26:24.798549651 +0800
X@@ -284,7 +284,7 @@
X fcitxinclude_HEADERS = \
X 					  im.h
X 
X-pkgconfigdir = $(libdir)/pkgconfig
X+pkgconfigdir = $(prefix)/libdata/pkgconfig
X pkgconfig_DATA = fcitx.pc
X EXTRA_DIST = \
X 	fcitx.pc.in
391c709e4f947ee4f6042adb718a6ee5
echo x - fcitx/files/patch-configure
sed 's/^X//' >fcitx/files/patch-configure << '42c6d964dfb66831825a66b539d3cee9'
X--- configure.orig	2010-11-17 23:45:30.000000000 +0800
X+++ configure	2010-11-29 23:14:00.118170150 +0800
X@@ -12635,7 +12635,7 @@
X case "$host" in
X     *-*-*freebsd*)
X     HOST_LIBS="-lexecinfo -pthread"
X-    md5prog=gmd5sum
X+    md5prog=md5
X     ;;
X     *-*-linux*)
X     HOST_LIBS="-ldl -lpthread"
X@@ -14550,6 +14550,9 @@
X fi
X 
X     ;;
X+	*-*-*freebsd*)
X+	DATADIRNAME=share
X+	;;
X     *)
X     DATADIRNAME=lib
X     ;;
42c6d964dfb66831825a66b539d3cee9
echo x - fcitx/files/patch-png-Makefile.in
sed 's/^X//' >fcitx/files/patch-png-Makefile.in << '5f3683bba541923c88c3c637855118b7'
X--- png/Makefile.in.orig	2010-11-27 21:49:04.591697974 +0800
X+++ png/Makefile.in	2010-11-27 21:50:06.021645318 +0800
X@@ -228,7 +228,7 @@
X top_build_prefix = @top_build_prefix@
X top_builddir = @top_builddir@
X top_srcdir = @top_srcdir@
X-pngdir = $(datadir)/pixmaps
X+pngdir = $(datadir)/pixmaps/@PACKAGE@
X png_DATA = \
X 		   fcitx.png \
X 		   fcitx-cangjie.png \
5f3683bba541923c88c3c637855118b7
echo x - fcitx/Makefile
sed 's/^X//' >fcitx/Makefile << '64237051247ab396f58fab071023fef1'
X# New ports collection makefile for:	Free Chinese Input Toy for X
X# Date created:				26 March 2003
X# Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
X#
X# $FreeBSD: ports/chinese/fcitx/Makefile,v 1.35 2010/08/03 02:11:50 danfe Exp $
X#
X
XPORTNAME=	fcitx
XPORTVERSION=	4.0.0
XCATEGORIES=	chinese x11
XMASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
XDISTFILES+=		${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
X
XMAINTAINER=	darcsis@gmail.com
XCOMMENT=	A simple and fast GBK Chinese XIM server
X
XLICENSE=	GPLv2
X
XDIST_SUBDIR=	fcitx
XEXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
XUSE_XORG=	xpm x11 xtst
XUSE_ICONV=	yes
XGNU_CONFIGURE=	yes
XUSE_GMAKE=	yes
X
XOPTIONS=	XFT		"Use Xft for Freetype font support" on \
X		TRAY		"Enable system tray support" on \
X		PANGO		"Enable pango for better font support" off \
X		DBUS		"Enable D-Bus for KIMPanel support" off \
X		RECORDING	"Enable recording of user input"    off \
X		DEBUG		"Enable debug build with logging"   off \
X
X.include <bsd.port.options.mk>
X
X.if defined(WITH_XFT)
XLIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
X.else
XCONFIGURE_ARGS+=	--disable-xft
X.endif
X
X.if defined(WITHOUT_TRAY)
XCONFIGURE_ARGS+=	--disable-tray
X.endif
X
X.if defined(WITH_PANGO)
XUSE_GNOME=	pango
XCONFIGURE_ARGS+=	--enable-pango
X.endif
X
X.if defined(WITH_DBUS)
XLIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
X.else
XCONFIGURE_ARGS+=	--disable-dbus
X.endif
X
X.if defined(WITH_RECORDING)
XCONFIGURE_ARGS+=	--enable-recording
X.endif
X
X.if defined(WITH_DEBUG)
XCONFIGURE_ARGS+=	--enable-debug --enable-log
X.endif
X
Xpost-patch:
X	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pinyin.tar.gz ${WRKSRC}/data
X	@${CP} ${DISTDIR}/${DIST_SUBDIR}/table.tar.gz ${WRKSRC}/data/table
X
Xpre-install:
X	@${CHMOD} +x ${WRKSRC}/install-sh
X
Xpost-install:
X	@${ECHO_CMD}
X	@${CAT} ${PKGMESSAGE}
X	@${ECHO_CMD}
X
X.include <bsd.port.mk>
64237051247ab396f58fab071023fef1
echo x - fcitx/distinfo
sed 's/^X//' >fcitx/distinfo << 'b5378162f4fce948a38737c64c765e70'
XSHA256 (fcitx/fcitx-4.0.0.tar.gz) = 750884e992f51d8557447dc02fe6ada9758392611fc3271849ed26eba33f2d1c
XSIZE (fcitx/fcitx-4.0.0.tar.gz) = 1357079
XSHA256 (fcitx/pinyin.tar.gz) = bf8c581450f9fac0eab0498927d1d5e5c1cd465ed9937e4d9362ca9d67920fa4
XSIZE (fcitx/pinyin.tar.gz) = 1613447
XSHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
XSIZE(fcitx/table.tar.gz) = 4144686
X
b5378162f4fce948a38737c64c765e70
exit


--=-=-=


-- 
Office machines which function perfectly during normal
business hours will break down when you return to the
office at night to use them for personal business.

--=-=-=--



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