From owner-svn-ports-head@freebsd.org Tue May 22 05:29:09 2018 Return-Path: Delivered-To: svn-ports-head@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 010FDEE755B; Tue, 22 May 2018 05:29:08 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9222983CA9; Tue, 22 May 2018 05:29:08 +0000 (UTC) (envelope-from koobs@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 6ADB27C38; Tue, 22 May 2018 05:29:08 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4M5T8J5061996; Tue, 22 May 2018 05:29:08 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4M5T8Dj061995; Tue, 22 May 2018 05:29:08 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201805220529.w4M5T8Dj061995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 22 May 2018 05:29:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470596 - head/textproc/py-docutils X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: head/textproc/py-docutils X-SVN-Commit-Revision: 470596 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 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: Tue, 22 May 2018 05:29:09 -0000 Author: koobs Date: Tue May 22 05:29:07 2018 New Revision: 470596 URL: https://svnweb.freebsd.org/changeset/ports/470596 Log: textproc/py-docutils: Fix/improve console scripts packaging Remove custom script symlink/packaging routine (and pkg-plist) that adds versions without .py filename suffix, in favour of what upstream provides by default. The manually maintained script list in the port was incomplete, so not all scripts were processed, producing an inconsistent experience (if not POLA violation) for users, and proves the mechanism itself is difficult to keep up-to-date and accurate. Additionally, all upstream documentation refers to these tools by their suffixed names. While I'm here: - Pet potlint (USES/USE_* order) - Add test target to make future QA easier/more thorough. Approved by: koobs (python, maintainer) Deleted: head/textproc/py-docutils/pkg-plist Modified: head/textproc/py-docutils/Makefile Modified: head/textproc/py-docutils/Makefile ============================================================================== --- head/textproc/py-docutils/Makefile Tue May 22 05:24:38 2018 (r470595) +++ head/textproc/py-docutils/Makefile Tue May 22 05:29:07 2018 (r470596) @@ -3,7 +3,7 @@ PORTNAME= docutils PORTVERSION= 0.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,19 +17,22 @@ LICENSE_COMB= multi PORTSCOUT= limit:^[0-9\.]*$$ NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils + USES= python +USE_PYTHON= autoplist concurrent distutils OPTIONS_DEFINE= PYGMENTS -PYGMENTS_DESC= Syntax highlighting -PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} -SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \ - rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html +PYGMENTS_DESC= Syntax highlighting +PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} -post-install: -.for script in ${SCRIPTS} - ${LN} -s ${script}.py-${PYTHON_VER} ${STAGEDIR}${PREFIX}/bin/${script} -.endfor +.include -.include +do-test: +.if ${PYTHON_VER} < 3 + @cd ${WRKSRC}/test && ${PYTHON_CMD} alltests.py +.else + @cd ${WRKSRC}/test3 && ${PYTHON_CMD} alltests.py +.endif + +.include