From owner-svn-ports-all@freebsd.org Mon Dec 17 10:04:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7CD751338527; Mon, 17 Dec 2018 10:04:17 +0000 (UTC) (envelope-from yuri@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 205058CF2F; Mon, 17 Dec 2018 10:04:17 +0000 (UTC) (envelope-from yuri@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 14898D6E1; Mon, 17 Dec 2018 10:04:17 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBHA4Gnh045605; Mon, 17 Dec 2018 10:04:16 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBHA4GPj045603; Mon, 17 Dec 2018 10:04:16 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201812171004.wBHA4GPj045603@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 17 Dec 2018 10:04:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487671 - in head/textproc/retext: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/textproc/retext: . files X-SVN-Commit-Revision: 487671 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 205058CF2F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 17 Dec 2018 10:04:17 -0000 Author: yuri Date: Mon Dec 17 10:04:16 2018 New Revision: 487671 URL: https://svnweb.freebsd.org/changeset/ports/487671 Log: textproc/retext: Fix broken translations; Fix autoplist 1. My previous commit r487632 deleted the empty directory. But it turned out that translation files are supposed to be there. With the help of the upstream, I fixed the translations. As it turned out, USES=qt:5 is needed, and lrelease should be made available to setup.py. The added patch makes setup.py to find lrelease, this was broken upstream. 2. autoplist was not used because it was broken due to the file name mismatch. PYDISTUTILS_INSTALLARGS=--no-rename is a workaround, permanent fix will be added by the upstream later. 3. Add NO_ARCH=yes. Approved by: portmgr (unbreak) Added: head/textproc/retext/files/ head/textproc/retext/files/patch-setup.py (contents, props changed) Deleted: head/textproc/retext/pkg-plist Modified: head/textproc/retext/Makefile Modified: head/textproc/retext/Makefile ============================================================================== --- head/textproc/retext/Makefile Mon Dec 17 09:57:50 2018 (r487670) +++ head/textproc/retext/Makefile Mon Dec 17 10:04:16 2018 (r487671) @@ -2,7 +2,7 @@ PORTNAME= retext PORTVERSION= 7.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= arved@FreeBSD.org @@ -15,15 +15,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:te ${PYTHON_PKGNAMEPREFIX}Markups>=3.0.0:textproc/py-markups@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown-math>=0.6:textproc/py-markdown-math@${PY_FLAVOR} -USES= python:3.2+ desktop-file-utils pyqt:5 +USES= python:3.2+ desktop-file-utils pyqt:5 qt:5 USE_GITHUB= yes GH_ACCOUNT= retext-project GH_PROJECT= retext -USE_PYTHON= distutils noflavors +USE_PYTHON= distutils autoplist noflavors +USE_QT= linguisttools_build USE_PYQT= core_run sip_run gui_run widgets_run printsupport_run \ network_run -post-stage: # https://github.com/retext-project/retext/issues/422 - @${RMDIR} ${STAGEDIR}${DATADIR}/locale +PYDISTUTILS_INSTALLARGS= --no-rename # workaround for the plist problem: https://github.com/retext-project/retext/issues/425 +BINARY_ALIAS= lrelease=${LRELEASE} + +NO_ARCH= yes .include Added: head/textproc/retext/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/retext/files/patch-setup.py Mon Dec 17 10:04:16 2018 (r487671) @@ -0,0 +1,25 @@ +Equivalent of the commit 162b0c787e2005efebac7beb97d1dd681bb692b7 +that fixes https://github.com/retext-project/retext/issues/422 + +--- setup.py.orig 2017-02-11 15:21:52 UTC ++++ setup.py +@@ -16,6 +16,7 @@ For more details, please go to the `home + + import platform + import re ++import os + import sys + from os.path import join + from distutils import log +@@ -35,9 +36,10 @@ if sys.version_info[0] < 3: + def build_translations(): + print('running build_translations') + error = None ++ environment = dict(os.environ, QT_SELECT='5') + for ts_file in glob(join('locale', '*.ts')): + try: +- check_call(('lrelease', ts_file), env={'QT_SELECT': '5'}) ++ check_call(('lrelease', ts_file), env=environment) + except Exception as e: + error = e + if error: