Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Oct 2016 19:07:59 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423884 - head/japanese/mozc-server
Message-ID:  <201610121907.u9CJ7xaS031396@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Wed Oct 12 19:07:59 2016
New Revision: 423884
URL: https://svnweb.freebsd.org/changeset/ports/423884

Log:
  japanese/mozc-server: with build with python3
  
  - limit python version to python 2.7
  - remove duplicated python direct build dependency
  - set correct python version in build scripts
  - fix packaging by not installing to /root:
  
    ====>> Checking for filesystem violations... done
    ====>> Error: Filesystem touched during build:
    extra: root/.mozc
  
  PR:		207937
  Submitted by:	Hiroo Ono <hiroo.ono+freebsd@gmail.com> (based on)
  Approved by:	maintainer timeout (14 days)

Modified:
  head/japanese/mozc-server/Makefile

Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile	Wed Oct 12 19:04:21 2016	(r423883)
+++ head/japanese/mozc-server/Makefile	Wed Oct 12 19:07:59 2016	(r423884)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mozc
 PORTVERSION=	2.17.2322.102
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	https://codeload.github.com/google/${PORTNAME}/tar.gz/9b4c9e0?dummy=/:main \
 		https://codeload.github.com/hiroyuki-komatsu/japanese-usage-dictionary/tar.gz/e5b3425?dummy=/:udic
@@ -18,7 +19,6 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ninja:devel/ninja \
-		python:lang/python \
 		gyp:devel/py-gyp
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
@@ -26,8 +26,9 @@ LIB_DEPENDS=	libprotobuf.so:devel/protob
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++11-lang pkgconfig iconv:wchar_t gmake \
-		tar:bzip2 python:build
+		tar:bzip2 python:2.7,build shebangfix
 WRKSRC=		${WRKDIR}/${PORTNAME}-9b4c9e0
+SHEBANG_FILES=	src/build_mozc.py
 BUILD_WRKSRC=	${WRKSRC}/src
 
 BUILD_MOZC_LIST?=	mozc_server
@@ -98,6 +99,8 @@ BUILD_GYP_CMD=	${SETENV} ${MAKE_ENV} ${L
 post-patch:
 	${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \
 	    ${BUILD_WRKSRC}/gui/qt_libraries.gypi
+	${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \
+	    ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \;
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
 	    ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
@@ -416,6 +419,8 @@ do-install-mozc_el:
 .endif
 
 do-build: ${BUILD_MOZC_LIST:S/^/do-build-/}
+post-build:
+	${RMDIR} /root/.mozc
 do-install: ${BUILD_MOZC_LIST:S/^/do-install-/}
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610121907.u9CJ7xaS031396>