1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

Update to 1.1.773.102.

PR:		159312
Submitted by:	HATANO Tomomi <hatanou@infolab.ne.jp>
This commit is contained in:
Maho Nakata 2011-08-08 08:29:29 +00:00
parent 29e18b3aea
commit 33ce48af03
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=279184
4 changed files with 30 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# New ports collection makefile for: mozc-tool
# New ports collection makefile for: mozc-el
# Date created: 26 June 2010
# Whom: TAKANO, Yuji
#
@ -6,9 +6,9 @@
#
PORTNAME= mozc-el
PORTVERSION= 0.13.523.102
PORTVERSION= 1.1.773.102
CATEGORIES= japanese textproc
MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/
MASTER_SITES= http://mozc.googlecode.com/files/
DISTNAME= mozc-${PORTVERSION}
MAINTAINER= maho@FreeBSD.org
@ -16,7 +16,8 @@ COMMENT= Mozc for GNU Emacs
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed \
${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep \
gyp:${PORTSDIR}/devel/py-gyp-devel
gyp:${PORTSDIR}/devel/py-gyp-devel \
zinnia:${PORTSDIR}/japanese/zinnia
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
gtest.0:${PORTSDIR}/devel/googletest \
protobuf.7:${PORTSDIR}/devel/protobuf
@ -27,8 +28,6 @@ USE_EMACS= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_PYTHON= yes
USE_QT_VER= 4
QT_COMPONENTS= gui dbus qmake_build moc_build uic_build rcc_build
PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/mozc.el \
${EMACS_VERSION_SITE_LISPDIR}/mozc.elc \
@ -67,8 +66,10 @@ do-build:
@cd ${WRKSRC}/; \
export BUILD_COMMAND=${GMAKE}; \
${PYTHON_CMD} build_mozc.py gyp --gypdir=${LOCALBASE}/bin; \
${PYTHON_CMD} build_mozc.py build_tools \
-c ${BUILD_MODE}; \
${PYTHON_CMD} build_mozc.py build \
-c ${BUILD_MODE} --qtdir=${QT_LIBDIR} \
-c ${BUILD_MODE} \
unix/emacs/emacs.gyp:mozc_emacs_helper
@cd ${WRKSRC}/unix/emacs; \
${EMACS_CMD} -batch -q -no-site-file -no-init-file \

View File

@ -1,2 +1,2 @@
SHA256 (mozc-0.13.523.102.tar.bz2) = e83a6fa874ac27cd5f15c014f22a5c03c749e9009a078fb812d4e127892abbe2
SIZE (mozc-0.13.523.102.tar.bz2) = 39269824
SHA256 (mozc-1.1.773.102.tar.bz2) = 24f9f05111ac40a7f121bc3c460429c54a7308cd65a7536a69c41cfc6c6c7850
SIZE (mozc-1.1.773.102.tar.bz2) = 36818453

View File

@ -1,8 +1,16 @@
--- gyp/common.gypi.org 2010-11-06 10:50:16.532187538 +0900
+++ gyp/common.gypi 2010-11-06 10:50:37.769189168 +0900
@@ -436,6 +436,12 @@
'-lz',
'<@(extra_linux_libs)',
--- gyp/common.gypi.orig 2011-07-19 14:42:19.000000000 +0900
+++ gyp/common.gypi 2011-07-30 12:56:54.000000000 +0900
@@ -447,7 +447,6 @@
'cflags': [
'<@(gcc_cflags)',
'<@(warning_cflags)',
- '-Wno-array-bounds', # Probably GCC's bug 43949 causes trouble.
'-fPIC',
'-fno-exceptions',
],
@@ -456,6 +455,12 @@
# <unordered_map> and <unordered_set>.
'-Wno-deprecated',
],
+ 'include_dirs': [
+ '@@LOCALBASE@@/include'

View File

@ -1,5 +1,5 @@
--- ipc/unix_ipc.cc.org 2010-11-06 10:51:14.204190823 +0900
+++ ipc/unix_ipc.cc 2010-11-06 10:54:18.096187153 +0900
--- ipc/unix_ipc.cc.orig 2011-07-19 14:42:19.000000000 +0900
+++ ipc/unix_ipc.cc 2011-07-30 12:38:28.000000000 +0900
@@ -41,7 +41,7 @@
#include <sys/time.h>
#include <sys/types.h>
@ -24,10 +24,10 @@
-#ifdef OS_LINUX
+#if defined(OS_LINUX) && !defined(__FreeBSD__)
struct ucred peer_cred;
int peer_cred_len = sizeof(peer_cred);
if (getsockopt(socket, SOL_SOCKET, SO_PEERCRED,
@@ -303,7 +303,7 @@
// On ARM Linux, we do nothing and just return true since the platform
// sometimes doesn't support the getsockopt(sock, SOL_SOCKET, SO_PEERCRED)
// system call.
@@ -309,7 +309,7 @@
address.sun_family = AF_UNIX;
::memcpy(address.sun_path, server_address.data(), server_address_length);
address.sun_path[server_address_length] = '\0';
@ -36,7 +36,7 @@
address.sun_len = SUN_LEN(&address);
const size_t sun_len = sizeof(address);
#else
@@ -423,21 +423,21 @@
@@ -429,21 +429,21 @@
SO_REUSEADDR,
reinterpret_cast<char *>(&on),
sizeof(on));