summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2012-07-19 23:35:57 +0000
committerXin LI <delphij@FreeBSD.org>2012-07-19 23:35:57 +0000
commitdf5e20fd069a6943025305f9908b4184fccbf2d2 (patch)
treea0751a938d964f23e1c99457cb68d890afaedece
parent- Chase ibus update. [1] (diff)
Update to 2.0.4 RC 2
PR: ports/170008 Submitted by: Zhihao Yuan <lichray gmail com> (maintainer)
Notes
Notes: svn path=/head/; revision=301199
-rw-r--r--chinese/sunpinyin/Makefile5
-rw-r--r--chinese/sunpinyin/distinfo4
-rw-r--r--chinese/sunpinyin/files/patch-SConstruct32
-rw-r--r--chinese/sunpinyin/pkg-plist1
4 files changed, 21 insertions, 21 deletions
diff --git a/chinese/sunpinyin/Makefile b/chinese/sunpinyin/Makefile
index 5312156406e5..3743a01d99a9 100644
--- a/chinese/sunpinyin/Makefile
+++ b/chinese/sunpinyin/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= sunpinyin
-DISTVERSION= 2.0.4rc1
+DISTVERSION= 2.0.4rc2
CATEGORIES= chinese devel
MASTER_SITES= LOCAL/wen:1 \
+ http://students.cs.niu.edu/~z1565938/distfiles/:1 \
${MASTER_SITE_GOOGLE_CODE}:1 \
http://open-gram.googlecode.com/files/:2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1 \
@@ -21,7 +22,7 @@ COMMENT= A statistical language model based input method engine
LICENSE= LGPL21 CDDL
LICENSE_COMB= dual
-LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL.LICENSE
diff --git a/chinese/sunpinyin/distinfo b/chinese/sunpinyin/distinfo
index 705b0eb89484..ce19f2fa0482 100644
--- a/chinese/sunpinyin/distinfo
+++ b/chinese/sunpinyin/distinfo
@@ -1,5 +1,5 @@
-SHA256 (sunpinyin-2.0.4rc1.tar.xz) = e8d752ca3fdf475cb097e71dfae3fbf7e118c373a3ea98d3742fc12ae838594e
-SIZE (sunpinyin-2.0.4rc1.tar.xz) = 969976
+SHA256 (sunpinyin-2.0.4rc2.tar.xz) = 075d80b5159362bc2fd4b5fece3db6de72658ccebf58ea96a91b3b13da5752d7
+SIZE (sunpinyin-2.0.4rc2.tar.xz) = 970072
SHA256 (lm_sc.t3g.arpa.tar.bz2) = 5fcbb6264befd03a75fad1301b8804a8df52972b2ea91045c7f2613904bbc6c7
SIZE (lm_sc.t3g.arpa.tar.bz2) = 36280876
SHA256 (dict.utf8.tar.bz2) = d0bcbc5b7005823e69c490a178d456d476069c640bf292028282e9a94d784418
diff --git a/chinese/sunpinyin/files/patch-SConstruct b/chinese/sunpinyin/files/patch-SConstruct
index bd6062cf73c1..06f76c04c87b 100644
--- a/chinese/sunpinyin/files/patch-SConstruct
+++ b/chinese/sunpinyin/files/patch-SConstruct
@@ -1,28 +1,28 @@
---- SConstruct.orig 2011-02-17 21:39:52.000000000 -0600
-+++ SConstruct 2011-11-10 03:04:39.833952104 -0600
-@@ -150,9 +150,13 @@ def CreateEnvironment():
- tar = 'gtar'
- make = 'gmake'
+--- SConstruct.orig 2012-07-17 23:25:59.000000000 -0500
++++ SConstruct 2012-07-17 23:40:11.633113871 -0500
+@@ -176,10 +176,12 @@ def CreateEnvironment():
-- return Environment(ENV=os.environ, CFLAGS=cflags, CXXFLAGS=cflags,
-- TAR=tar, MAKE=make, WGET=wget,
-- CPPPATH=['.'] + allinc())
-+ env = Environment(**ARGUMENTS)
+ libln_builder = Builder(action='ln -s ${SOURCE.name} ${TARGET.name}',
+ chdir=True)
+- env = Environment(ENV=os.environ, CFLAGS=cflags, CXXFLAGS=cflags,
+- TAR=tar, MAKE=make, WGET=wget,
+- CPPPATH=['.'] + allinc(),
+- tools=['default', 'textfile'])
++ env = Environment(tools=['default', 'textfile'], **ARGUMENTS)
+ env['ENV'] = os.environ
+ env['TAR'] = tar
+ env['MAKE'] = make
+ env['CPPPATH'] = ['.'] + allinc()
+
-+ return env
+ env.Append(BUILDERS={'InstallAsSymlink': libln_builder})
+ return env
- def PassVariables(envvar, env):
- for (x, y) in envvar:
-@@ -382,7 +386,7 @@ def DoInstall():
- (install_path, libname, libname_link))
+@@ -420,7 +422,7 @@ def DoInstall():
+ lib_target_bin),
]
-- lib_pkgconfig_target = env.Install(libdir+'/pkgconfig',
-+ lib_pkgconfig_target = env.Install(env['PREFIX']+'/libdata/pkgconfig',
+- 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'])
libdata_target = env.Install(libdatadir,
['data/lm_sc.t3g',
diff --git a/chinese/sunpinyin/pkg-plist b/chinese/sunpinyin/pkg-plist
index 98317b256586..51e58219841e 100644
--- a/chinese/sunpinyin/pkg-plist
+++ b/chinese/sunpinyin/pkg-plist
@@ -8,7 +8,6 @@ include/sunpinyin-2.0/ime-core/imi_keys.h
include/sunpinyin-2.0/ime-core/imi_option_event.h
include/sunpinyin-2.0/ime-core/imi_option_keys.h
include/sunpinyin-2.0/ime-core/imi_options.h
-include/sunpinyin-2.0/ime-core/imi_plugin.h
include/sunpinyin-2.0/ime-core/imi_uiobjects.h
include/sunpinyin-2.0/ime-core/imi_view.h
include/sunpinyin-2.0/ime-core/imi_view_classic.h