Date: Mon, 17 Sep 2012 08:29:02 +0000 (UTC) From: Daichi GOTO <daichi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304390 - in head/japanese/mozc-server: . files Message-ID: <201209170829.q8H8T2M4077853@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: daichi Date: Mon Sep 17 08:29:02 2012 New Revision: 304390 URL: http://svn.freebsd.org/changeset/ports/304390 Log: fixed a FreeBSD 9.x build issue Modified: head/japanese/mozc-server/Makefile head/japanese/mozc-server/files/patch-base_base.gyp head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Mon Sep 17 07:59:30 2012 (r304389) +++ head/japanese/mozc-server/Makefile Mon Sep 17 08:29:02 2012 (r304390) @@ -7,6 +7,7 @@ PORTNAME= mozc PORTVERSION= 1.6.1187.102 +PORTREVISION= 1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX?= ja- @@ -29,7 +30,9 @@ USE_OPENSSL= yes BUILD_MOZC_LIST?= mozc_server -.if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" +.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" +USE_GNOME+= glib20 gtk20 +.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" USE_QT4+= gui dbus qmake_build moc_build uic_build rcc_build .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" USE_GNOME+= glib20 gtk20 pygtk2 @@ -60,10 +63,12 @@ LOCALBASE_REPLACE_FILES= \ unix/ibus/gen_mozc_xml.py \ unix/ibus/mozc.xml \ unix/ibus/path_util.cc \ + base/base.gyp \ base/util.cc \ base/process.cc \ gui/about_dialog/about_dialog.cc \ - handwriting/zinnia_handwriting.cc + handwriting/zinnia_handwriting.cc \ + third_party/gyp/pylib/gyp/generator/make.py SSL_REINPLACE_STR= .for V in OPENSSL_CFLAGS OPENSSLLIB OPENSSLINC OPENSSL_LDFLAGS SSL_REINPLACE_STR+= -e "s,%%${V}%%,${${V}}," Modified: head/japanese/mozc-server/files/patch-base_base.gyp ============================================================================== --- head/japanese/mozc-server/files/patch-base_base.gyp Mon Sep 17 07:59:30 2012 (r304389) +++ head/japanese/mozc-server/files/patch-base_base.gyp Mon Sep 17 08:29:02 2012 (r304390) @@ -1,5 +1,5 @@ --- base/base.gyp.orig 2012-09-07 10:21:29.099021913 +0900 -+++ base/base.gyp 2012-09-07 10:30:46.575021640 +0900 ++++ base/base.gyp 2012-09-12 12:53:34.737234489 +0900 @@ -262,20 +262,20 @@ }], ['OS=="linux" and target_platform!="Android"', { Modified: head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py ============================================================================== --- head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py Mon Sep 17 07:59:30 2012 (r304389) +++ head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py Mon Sep 17 08:29:02 2012 (r304390) @@ -1,15 +1,17 @@ --- third_party/gyp/pylib/gyp/common.py.orig 2012-09-07 10:21:29.147021135 +0900 -+++ third_party/gyp/pylib/gyp/common.py 2012-09-07 10:30:44.711021503 +0900 -@@ -362,8 +362,10 @@ ++++ third_party/gyp/pylib/gyp/common.py 2012-09-17 17:14:43.781601968 +0900 +@@ -362,9 +362,11 @@ 'win32': 'win', 'darwin': 'mac', 'sunos5': 'solaris', - 'freebsd7': 'freebsd', - 'freebsd8': 'freebsd', +- 'freebsd9': 'freebsd', + 'freebsd7': 'linux', + 'freebsd8': 'linux', + 'freebsd9': 'linux', + 'freebsd10': 'linux', - 'freebsd9': 'freebsd', ++ 'freebsd11': 'linux', } flavor = flavors.get(sys.platform, 'linux') + return params.get('flavor', flavor) Modified: head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py ============================================================================== --- head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py Mon Sep 17 07:59:30 2012 (r304389) +++ head/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py Mon Sep 17 08:29:02 2012 (r304390) @@ -1,5 +1,5 @@ --- third_party/gyp/pylib/gyp/generator/make.py.orig 2012-09-07 10:21:29.146021648 +0900 -+++ third_party/gyp/pylib/gyp/generator/make.py 2012-09-07 10:30:44.778021410 +0900 ++++ third_party/gyp/pylib/gyp/generator/make.py 2012-09-17 17:15:20.613807429 +0900 @@ -1963,6 +1963,9 @@ srcdir_prefix = '$(srcdir)/'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209170829.q8H8T2M4077853>