Date: Thu, 19 Jul 2012 15:21:49 -0700 (PDT) From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/170008: [UPDATE] chinese/sunpinyin to the latest git version Message-ID: <5008887d.a70c320a.5c77.ffffff34@mx.google.com> Resent-Message-ID: <201207192230.q6JMU9cL022131@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170008 >Category: ports >Synopsis: [UPDATE] chinese/sunpinyin to the latest git version >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jul 19 22:30:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.3-STABLE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD elitebook.hp 8.3-STABLE FreeBSD 8.3-STABLE #3 r237726: Thu Jun 28 15:59:28 CDT 2012 lichray@elitebook.hp:/usr/obj/usr/src/sys/HOUKAGO amd64 >Description: The git repo is at https://github.com/sunpinyin/sunpinyin . This version contains some changes required by the coming fcitx-sunpinyin, so please handle this PR ASAP. Thanks. Changes: * The plugin support is disabled by default (from upstream, and unused by our ports tree). IMPORTANT: The distfile was hosted by wen@, but I can't find him recently. So I added my university link to the MASTER_SITES. Please host the distfile for me instead (replace LOCAL/wen with yours) and be sure to REMOVE my university link before you commit this! >How-To-Repeat: >Fix: --- sunpinyin-r2-2.patch begins here --- diff -rupN sunpinyin.orig/Makefile sunpinyin/Makefile --- sunpinyin.orig/Makefile 2012-05-25 02:25:44.000000000 -0500 +++ sunpinyin/Makefile 2012-07-19 17:11:05.998331028 -0500 @@ -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 ba 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 -rupN sunpinyin.orig/distinfo sunpinyin/distinfo --- sunpinyin.orig/distinfo 2012-05-25 02:25:44.000000000 -0500 +++ sunpinyin/distinfo 2012-07-17 23:33:15.932313707 -0500 @@ -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 -rupN sunpinyin.orig/files/patch-SConstruct sunpinyin/files/patch-SConstruct --- sunpinyin.orig/files/patch-SConstruct 2011-11-10 20:46:16.000000000 -0600 +++ sunpinyin/files/patch-SConstruct 2012-07-17 23:40:15.416193404 -0500 @@ -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 -rupN sunpinyin.orig/pkg-plist sunpinyin/pkg-plist --- sunpinyin.orig/pkg-plist 2012-05-25 02:25:44.000000000 -0500 +++ sunpinyin/pkg-plist 2012-07-17 23:41:52.157229168 -0500 @@ -8,7 +8,6 @@ include/sunpinyin-2.0/ime-core/imi_keys. 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 --- sunpinyin-r2-2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5008887d.a70c320a.5c77.ffffff34>