Index: head/chinese/sunpinyin/files/patch-SConstruct =================================================================== --- head/chinese/sunpinyin/files/patch-SConstruct (revision 425207) +++ head/chinese/sunpinyin/files/patch-SConstruct (revision 425208) @@ -1,34 +1,34 @@ ---- SConstruct.orig 2014-11-14 09:17:48.000000000 -0500 -+++ SConstruct 2015-04-01 16:11:27.540297600 -0400 +--- SConstruct.orig 2014-11-14 14:17:48 UTC ++++ SConstruct @@ -215,10 +215,11 @@ def CreateEnvironment(): make = 'gmake' tar = 'gtar' libln_builder = Builder(action='cd ${TARGET.dir} && ln -s ${SOURCE.name} ${TARGET.name}') - env = Environment(ENV=os.environ, CFLAGS=cflags, CXXFLAGS='', + env = Environment(ENV=os.environ, MAKE=make, WGET=wget, W3M=w3m, TAR=tar, - CPPPATH=['.'] + allinc(), - tools=['default', 'textfile']) + tools=['default', 'textfile'], + **ARGUMENTS) + env['CPPPATH'] = ['.'] + allinc() env.Append(BUILDERS={'InstallAsSymlink': libln_builder}) env['ENDIANNESS'] = "be" if sys.byteorder == "big" else "le" return env @@ -375,7 +376,6 @@ def DoConfigure(): conf.CheckFunc('getopt_long') conf.CheckFunc('getpagesize') conf.CheckFunc('get_opt') - conf.CheckCHeader('iconv.h') conf.CheckCHeader('inttypes.h') conf.CheckCHeader('locale.h') conf.CheckCHeader('libintl.h') @@ -463,7 +463,7 @@ def DoInstall(): lib_target_bin), ] - lib_pkgconfig_target = env.Install(os.path.join(libdir, 'pkgconfig'), + lib_pkgconfig_target = env.Install(os.path.join(env['PREFIX'], 'libdata/pkgconfig'), ['sunpinyin-2.0.pc']) bin_target = env.Install(bindir, bins) man1_target = env.Install(man1dir, man1s) Index: head/chinese/sunpinyin/files/patch-man_SConscript =================================================================== --- head/chinese/sunpinyin/files/patch-man_SConscript (nonexistent) +++ head/chinese/sunpinyin/files/patch-man_SConscript (revision 425208) @@ -0,0 +1,11 @@ +--- man/SConscript.orig 2014-11-14 14:17:48 UTC ++++ man/SConscript +@@ -1,7 +1,7 @@ + import os + Import('env') + +-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET') ++pod2man = Builder(action = 'pod2man $SOURCE $TARGET') + env.Append(BUILDERS = {'Man': pod2man}) + + env.Man('mmseg.1', 'mmseg.pod') Property changes on: head/chinese/sunpinyin/files/patch-man_SConscript ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp =================================================================== --- head/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp (revision 425207) +++ head/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp (revision 425208) @@ -1,16 +1,18 @@ ---- ./src/ime-core/imi_winHandler.cpp~ 2011-02-17 21:39:52.000000000 -0600 -+++ ./src/ime-core/imi_winHandler.cpp 2011-11-11 02:29:45.163309361 -0600 -@@ -85,6 +85,7 @@ CIMIWinHandler::throwBackKey(unsigned ke +--- src/ime-core/imi_winHandler.cpp.orig 2014-11-14 14:17:48 UTC ++++ src/ime-core/imi_winHandler.cpp +@@ -87,6 +87,7 @@ CIMIWinHandler::throwBackKey(unsigned ke void CIMIWinHandler::updateStatus(int key, int value) { +#ifdef DEBUG switch (key) { case STATUS_ID_CN: printf("CN status is "); break; -@@ -99,4 +100,5 @@ CIMIWinHandler::updateStatus(int key, in +@@ -101,6 +102,7 @@ CIMIWinHandler::updateStatus(int key, in printf("%d\n", value); fflush(stdout); +#endif } + + // -*- indent-tabs-mode: nil -*- vim:et:ts=4 Index: head/chinese/sunpinyin/files/patch-src_portability.h =================================================================== --- head/chinese/sunpinyin/files/patch-src_portability.h (revision 425207) +++ head/chinese/sunpinyin/files/patch-src_portability.h (revision 425208) @@ -1,10 +1,10 @@ ---- src/portability.h.orig 2014-08-19 21:12:42.000000000 -0400 -+++ src/portability.h 2014-08-19 21:12:51.000000000 -0400 +--- src/portability.h.orig 2014-11-14 14:17:48 UTC ++++ src/portability.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #include Property changes on: head/chinese/sunpinyin/files/patch-src_portability.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in =================================================================== --- head/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in (revision 425207) +++ head/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in (revision 425208) @@ -1,26 +1,26 @@ ---- src/sunpinyin-dictgen.mk.in.orig 2014-11-14 09:17:48.000000000 -0500 -+++ src/sunpinyin-dictgen.mk.in 2015-04-01 14:42:35.541184598 -0400 +--- src/sunpinyin-dictgen.mk.in.orig 2014-11-14 14:17:48 UTC ++++ src/sunpinyin-dictgen.mk.in @@ -42,22 +42,7 @@ DL_ROOT = ${DL_HOST}/open-gram DICT_PAT = 'dict\.utf8-[0-9]\+.tar.bz2' SLM_PAT = 'lm_sc\.3gm\.arpa-[0-9]\+.tar.bz2' -DICT_AR = $(shell ${W3M} ${DL_LIST} | grep -o ${DICT_PAT} | sort | tail -n 1) -SLM_AR = $(shell ${W3M} ${DL_LIST} | grep -o ${SLM_PAT} | sort | tail -n 1) - -all: install - -${DICT_AR}: - ${WGET} ${DL_ROOT}/$@ - -dict.utf8: ${DICT_AR} - ${TAR} xmf $^ - -${SLM_AR}: - ${WGET} ${DL_ROOT}/$@ - -lm_sc.3gm.arpa: ${SLM_AR} - ${TAR} xmf $^ +all: lm_sc.t3g pydict_sc.bin lm_sc.3gm: lm_sc.3gm.arpa dict.utf8 slmpack $^ $@ Index: head/chinese/sunpinyin/files/patch-xdg =================================================================== --- head/chinese/sunpinyin/files/patch-xdg (revision 425207) +++ head/chinese/sunpinyin/files/patch-xdg (revision 425208) @@ -1,37 +1,35 @@ ---- src/ime-core/imi_options.cpp~ 2012-05-13 22:55:19.000000000 -0500 -+++ src/ime-core/imi_options.cpp 2012-05-13 23:08:27.566965023 -0500 +--- src/ime-core/imi_options.cpp.orig 2014-11-14 14:17:48 UTC ++++ src/ime-core/imi_options.cpp @@ -73,12 +73,15 @@ CSimplifiedChinesePolicy::loadResources( if (!m_user_data_dir.size()) { char path[256]; - const char *home = getenv("HOME"); - snprintf(path, - sizeof(path), - "%s/%s", - home, - SUNPINYIN_USERDATA_DIR_PREFIX); + const char *home = getenv("XDG_CONFIG_HOME"); + if (home == NULL) + snprintf(path, sizeof(path), + "%s/.config/%s", getenv("HOME"), + SUNPINYIN_USERDATA_DIR_PREFIX); + else + snprintf(path, sizeof(path), + "%s/%s", home, + SUNPINYIN_USERDATA_DIR_PREFIX); m_user_data_dir = path; } -diff -uNr src/ime-core/imi_options.h src/ime-core/imi_options.h ---- src/ime-core/imi_options.h 2010-09-22 13:14:35.883000000 +0800 -+++ src/ime-core/imi_options.h 2010-09-22 13:15:20.760000002 +0800 -@@ -50,7 +50,7 @@ - #include "pinyin/shuangpin_seg.h" +--- src/ime-core/imi_options.h.orig 2014-11-14 14:17:48 UTC ++++ src/ime-core/imi_options.h +@@ -52,7 +52,7 @@ + #include "pinyin/hunpin_seg.h" #ifndef SUNPINYIN_USERDATA_DIR_PREFIX -#define SUNPINYIN_USERDATA_DIR_PREFIX ".sunpinyin" +#define SUNPINYIN_USERDATA_DIR_PREFIX "sunpinyin" #endif - struct CSimplifiedChinesePolicy : public IConfigurable - + struct CSimplifiedChinesePolicy : public IConfigurable {