From owner-svn-ports-all@FreeBSD.ORG Sun Nov 3 12:56:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DC2EFB86; Sun, 3 Nov 2013 12:56:34 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9AC72D39; Sun, 3 Nov 2013 12:56:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3CuYVP070327; Sun, 3 Nov 2013 12:56:34 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3CuYdP070325; Sun, 3 Nov 2013 12:56:34 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201311031256.rA3CuYdP070325@svn.freebsd.org> From: Hiroki Sato Date: Sun, 3 Nov 2013 12:56:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332611 - in head/japanese/mozc-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 12:56:35 -0000 Author: hrs Date: Sun Nov 3 12:56:34 2013 New Revision: 332611 URL: http://svnweb.freebsd.org/changeset/ports/332611 Log: - Fix build on 10.x. - Add STAGEDIR support. Modified: head/japanese/mozc-server/Makefile head/japanese/mozc-server/files/patch-base_compiler_specific.h Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sun Nov 3 12:44:32 2013 (r332610) +++ head/japanese/mozc-server/Makefile Sun Nov 3 12:56:34 2013 (r332611) @@ -49,7 +49,6 @@ USE_GNOME= glib20 gtk20 USE_EMACS= yes .endif -NO_STAGE= yes .include .if ${OSVERSION} < 800107 @@ -153,7 +152,7 @@ do-install-mozc_server: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .endif # mozc_tool @@ -176,15 +175,15 @@ do-build-mozc_tool: do-install-mozc_tool: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \ - ${PREFIX}/libexec - ${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${PREFIX}/bin - @${MKDIR} ${DATADIR}/icons + ${STAGEDIR}${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR}/icons ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ - ${DATADIR}/icons/product_logo.png + ${STAGEDIR}${DATADIR}/icons/product_logo.png ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ - ${DATADIR}/icons/update_uptodate.png + ${STAGEDIR}${DATADIR}/icons/update_uptodate.png .endif # ibus_mozc @@ -222,23 +221,23 @@ do-build-ibus_mozc: do-install-ibus_mozc: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \ - ${PREFIX}/bin/mozc_renderer + ${STAGEDIR}${PREFIX}/bin/mozc_renderer ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \ - ${PREFIX}/libexec/ibus-engine-mozc + ${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc ${INSTALL_DATA} \ ${WRKSRC}/out_linux/${BUILD_MODE}/obj/gen/unix/ibus/mozc.xml \ - ${PREFIX}/share/ibus/component/mozc.xml - @${MKDIR} ${DATADIR}/icons + ${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml + @${MKDIR} ${STAGEDIR}${DATADIR}/icons .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/${F}.png \ - ${DATADIR}/icons/${F:S/^ui-//}.png + ${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png .endfor ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ - ${DATADIR}/icons/product_icon.png + ${STAGEDIR}${DATADIR}/icons/product_icon.png .endif # fcitx_mozc @@ -281,32 +280,32 @@ do-build-fcitx_mozc: do-install-fcitx_mozc: @${MKDIR} \ - ${PREFIX}/lib/fcitx \ - ${PREFIX}/share/fcitx/addon \ - ${PREFIX}/share/fcitx/inputmethod + ${STAGEDIR}${PREFIX}/lib/fcitx \ + ${STAGEDIR}${PREFIX}/share/fcitx/addon \ + ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod ${INSTALL_LIB} \ ${WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \ - ${PREFIX}/lib/fcitx/fcitx-mozc.so + ${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so ${INSTALL_DATA} \ ${WRKSRC}/unix/fcitx/fcitx-mozc.conf \ - ${PREFIX}/share/fcitx/addon/fcitx-mozc.conf + ${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf ${INSTALL_DATA} \ ${WRKSRC}/unix/fcitx/mozc.conf \ - ${PREFIX}/share/fcitx/inputmethod/mozc.conf + ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf @${MKDIR} ${DATADIR}/icon .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/${F}.png \ - ${DATADIR}/icon/${F:S,^ui-,mozc-,}.png + ${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png .endfor ${INSTALL_DATA} \ ${WRKSRC}/data/images/product_icon_32bpp-128.png \ - ${DATADIR}/icon/mozc.png + ${STAGEDIR}${DATADIR}/icon/mozc.png .for L in ja zh_CN zh_TW ${INSTALL_DATA} \ ${WRKSRC}/out_linux/${BUILD_MODE}/obj/gen/unix/fcitx/po/${L}.mo \ - ${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo + ${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo .endfor .endif @@ -332,15 +331,10 @@ do-install-mozc_el: ${WRKSRC}/unix/emacs/mozc.el \ ${WRKSRC}/unix/emacs/mozc.elc \ ${FILESDIR}/leim-list.el \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ + ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ .endif do-build: ${BUILD_MOZC_LIST:S/^/do-build-/} do-install: ${BUILD_MOZC_LIST:S/^/do-install-/} -.if defined(PKGMESSAGE) && exists(${PKGMESSAGE}) -post-install: - @${CAT} ${PKGMESSAGE} -.endif - .include Modified: head/japanese/mozc-server/files/patch-base_compiler_specific.h ============================================================================== --- head/japanese/mozc-server/files/patch-base_compiler_specific.h Sun Nov 3 12:44:32 2013 (r332610) +++ head/japanese/mozc-server/files/patch-base_compiler_specific.h Sun Nov 3 12:56:34 2013 (r332611) @@ -1,13 +1,11 @@ --- base/compiler_specific.h.orig 2013-07-17 11:38:04.000000000 +0900 -+++ base/compiler_specific.h 2013-07-20 00:41:09.000000000 +0900 -@@ -236,4 +236,10 @@ ++++ base/compiler_specific.h 2013-11-03 21:42:23.000000000 +0900 +@@ -236,4 +236,8 @@ #endif // _MSC_VER or !_MSC_VER // === End suppress warning C4355 macro definitions === -+#if 0 -+#define static_assert(a,b) { char _dum[(a) ? 1 : 0]; } -+#endif ++#ifndef static_assert +#define static_assert(a,b) -+#define unique_ptr auto_ptr ++#endif + #endif // MOZC_BASE_COMPILER_SPECIFIC_H