From owner-svn-ports-all@freebsd.org Sat Aug 3 20:55:10 2019 Return-Path: Delivered-To: svn-ports-all@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 01F54BAE53; Sat, 3 Aug 2019 20:55:10 +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 461GWK68B5z4gKb; Sat, 3 Aug 2019 20:55:09 +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 B047F20BD0; Sat, 3 Aug 2019 20:55:09 +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 x73Kt9NH083695; Sat, 3 Aug 2019 20:55:09 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x73Kt97l083694; Sat, 3 Aug 2019 20:55:09 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201908032055.x73Kt97l083694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sat, 3 Aug 2019 20:55:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507998 - head/sysutils/py-ranger X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: head/sysutils/py-ranger X-SVN-Commit-Revision: 507998 X-SVN-Commit-Repository: ports 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.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: Sat, 03 Aug 2019 20:55:10 -0000 X-List-Received-Date: Sat, 03 Aug 2019 20:55:10 -0000 Author: kai Date: Sat Aug 3 20:55:09 2019 New Revision: 507998 URL: https://svnweb.freebsd.org/changeset/ports/507998 Log: sysutils/py-ranger: Respect hier(7) and make concurrent safe Documentation related files were installed into ${PREFIX}/doc instead of ${PREFIX}/share/doc. [1] Take this opportunity too to make the port concurrent safe as it installs beside documentation also scripts and a desktop entry. Introduce an appropriate workaround for the desktop entry by prefixing the filename after the corresponding Python flavor and also take care for the script executable. Add "desktop-file-utils" to USES to update the desktop database and reduce warnings in the stage QA. Remove "python_OLD_CMD" that is no longer required and place a "do-test" target with the required dependencies to easen QA related tasks in future. PR: 237775 Reported by: Ting-Wei Lan [1] Approved by: maintainer timeout (14 days) Modified: head/sysutils/py-ranger/Makefile Modified: head/sysutils/py-ranger/Makefile ============================================================================== --- head/sysutils/py-ranger/Makefile Sat Aug 3 20:29:13 2019 (r507997) +++ head/sysutils/py-ranger/Makefile Sat Aug 3 20:55:09 2019 (r507998) @@ -3,6 +3,7 @@ PORTNAME= ranger PORTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= https://ranger.github.io/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,15 +12,29 @@ MAINTAINER= linpct@gmail.com COMMENT= Ranger is a file manager with VI key bindings LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python shebangfix +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} + +USES= desktop-file-utils python shebangfix +USE_PYTHON= autoplist concurrent distutils + SHEBANG_FILES= doc/tools/*.py -python_OLD_CMD= /bin/python -USE_PYTHON= autoplist distutils + NO_ARCH= yes +post-extract: + @${MV} ${WRKSRC}/doc/ranger.desktop ${WRKSRC}/doc/${PYTHON_PKGNAMEPREFIX}ranger.desktop + post-patch: - @${REINPLACE_CMD} -e 's|setuptools|distutils.core|; s|share/man/man|man/man|;s|share/doc|doc|' ${WRKSRC}/${PYSETUP} + @${REINPLACE_CMD} -e 's|setuptools|distutils.core|; \ + s|share/man/man|man/man|; \ + s|share/doc/ranger|${DOCSDIR}|; \ + s|ranger.desktop|${PYTHON_PKGNAMEPREFIX}ranger.desktop|' ${WRKSRC}/${PYSETUP} + @${REINPLACE_CMD} -Ee 's|Exec=(ranger)|Exec=\1-${PYTHON_VER}|' ${WRKSRC}/doc/${PYTHON_PKGNAMEPREFIX}ranger.desktop @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/ranger/ext/img_display.py + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v .include