From owner-svn-ports-head@freebsd.org Sat May 16 11:05:01 2020 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 9DD332EE57B; Sat, 16 May 2020 11:05:01 +0000 (UTC) (envelope-from sunpoet@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 49PMqv6ZNFz4Npy; Sat, 16 May 2020 11:04:59 +0000 (UTC) (envelope-from sunpoet@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 5380CCEC4; Sat, 16 May 2020 11:04:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04GB4uK0029219; Sat, 16 May 2020 11:04:56 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04GB4uSd029217; Sat, 16 May 2020 11:04:56 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202005161104.04GB4uSd029217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 16 May 2020 11:04:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535460 - head/devel/py-yaml X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/devel/py-yaml X-SVN-Commit-Revision: 535460 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.33 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: Sat, 16 May 2020 11:05:01 -0000 Author: sunpoet Date: Sat May 16 11:04:56 2020 New Revision: 535460 URL: https://svnweb.freebsd.org/changeset/ports/535460 Log: Convert to options helper - Use USE_PYTHON=concurrent instead of setting EXAMPLESDIR manually - Sort PLIST PR: 246407 Submitted by: sunpoet (myself) Approved by: jpaetzel (maintainer) Modified: head/devel/py-yaml/Makefile head/devel/py-yaml/pkg-plist Modified: head/devel/py-yaml/Makefile ============================================================================== --- head/devel/py-yaml/Makefile Sat May 16 11:04:50 2020 (r535459) +++ head/devel/py-yaml/Makefile Sat May 16 11:04:56 2020 (r535460) @@ -14,14 +14,14 @@ COMMENT= Python YAML parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +USES= python +USE_PYTHON= autoplist concurrent distutils + OPTIONS_DEFINE= LIBYAML EXAMPLES LIBYAML_DESC= Use textproc/libyaml for faster parsing -USES= python -USE_PYTHON= distutils autoplist +LIBYAML_LIB_DEPENDS= libyaml.so:textproc/libyaml -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} - .include .if ${PORT_OPTIONS:MLIBYAML} @@ -29,10 +29,6 @@ PYDISTUTILS_SETUP+= --with-libyaml PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS+= --include-dirs=${LOCALBASE}/include \ --library-dirs=${LOCALBASE}/lib -LIB_DEPENDS+= libyaml.so:textproc/libyaml - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_yaml.so .else PYDISTUTILS_SETUP+= --without-libyaml NO_ARCH= yes @@ -40,6 +36,9 @@ NO_ARCH= yes post-install-EXAMPLES-on: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) + +post-install-LIBYAML-on: + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_yaml.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Modified: head/devel/py-yaml/pkg-plist ============================================================================== --- head/devel/py-yaml/pkg-plist Sat May 16 11:04:50 2020 (r535459) +++ head/devel/py-yaml/pkg-plist Sat May 16 11:04:56 2020 (r535460) @@ -1,4 +1,4 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygments-lexer/yaml.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygments-lexer/example.yaml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygments-lexer/yaml.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yaml-highlight/yaml_hl.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yaml-highlight/yaml_hl.py