From owner-svn-ports-head@freebsd.org Mon Jul 15 10:14:38 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6FBAB60B2; Mon, 15 Jul 2019 10:14:38 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CA20289629; Mon, 15 Jul 2019 10:14:38 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A757F1C154; Mon, 15 Jul 2019 10:14:38 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6FAEcTD055474; Mon, 15 Jul 2019 10:14:38 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6FAEctv055473; Mon, 15 Jul 2019 10:14:38 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201907151014.x6FAEctv055473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Mon, 15 Jul 2019 10:14:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506655 - head/textproc/py-ocrmypdf X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: head/textproc/py-ocrmypdf X-SVN-Commit-Revision: 506655 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CA20289629 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2019 10:14:39 -0000 Author: kai Date: Mon Jul 15 10:14:38 2019 New Revision: 506655 URL: https://svnweb.freebsd.org/changeset/ports/506655 Log: textproc/py-ocrmypdf: Use defined locale in whole build process * Set the locale globally for {CONFIGURE,MAKE}_ENV so that the locale doesn't need to be set explicitly for the do-test target. * Use ECHO_CMD instead of ECHO as the latter one is already defined in /usr/share/mk/sys.mk, which can either be "echo" or "true" if the make flag -s is given. Suggested by: sunpoet Modified: head/textproc/py-ocrmypdf/Makefile Modified: head/textproc/py-ocrmypdf/Makefile ============================================================================== --- head/textproc/py-ocrmypdf/Makefile Mon Jul 15 10:11:37 2019 (r506654) +++ head/textproc/py-ocrmypdf/Makefile Mon Jul 15 10:14:38 2019 (r506655) @@ -52,7 +52,7 @@ SHEBANG_FILES= src/ocrmypdf/__main__.py \ tests/spoof/gs_raster_failure.py \ tests/spoof/tesseract_crash.py -MAKE_ENV= LC_ALL=en_US.UTF-8 +USE_LOCALE= en_US.UTF-8 NO_ARCH= yes @@ -63,14 +63,14 @@ NO_ARCH= yes # See here for a related issue from another port (audio/py-sounddevice): # https://github.com/spatialaudio/python-sounddevice/issues/116 post-install: - ${ECHO} "${PYTHONPREFIX_SITELIBDIR}/ocrmypdf/lib/__pycache__/_leptonica.cpython-${PYTHON_SUFFIX}.opt-1.pyc" >> ${_PYTHONPKGLIST} - ${ECHO} "${PYTHONPREFIX_SITELIBDIR}/ocrmypdf/lib/__pycache__/_leptonica.cpython-${PYTHON_SUFFIX}.pyc" >> ${_PYTHONPKGLIST} - ${ECHO} "${PYTHONPREFIX_SITELIBDIR}/ocrmypdf/lib/_leptonica.py" >> ${_PYTHONPKGLIST} + ${ECHO_CMD} "${PYTHONPREFIX_SITELIBDIR}/ocrmypdf/lib/__pycache__/_leptonica.cpython-${PYTHON_SUFFIX}.opt-1.pyc" >> ${_PYTHONPKGLIST} + ${ECHO_CMD} "${PYTHONPREFIX_SITELIBDIR}/ocrmypdf/lib/__pycache__/_leptonica.cpython-${PYTHON_SUFFIX}.pyc" >> ${_PYTHONPKGLIST} + ${ECHO_CMD} "${PYTHONPREFIX_SITELIBDIR}/ocrmypdf/lib/_leptonica.py" >> ${_PYTHONPKGLIST} # Some unittests use a custom marker (= "slow") which is also used here, so # that the overall test doesn't finish with a warning. do-test: - @cd ${WRKSRC} && ${SETENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} -m pytest -rs -v \ + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m pytest -rs -v \ -n ${MAKE_JOBS_NUMBER} -o 'markers=slow' -o 'addopts="--runslow"' -k ' \ not test_dev_null and \ not test_mono_not_inverted'