Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 May 2020 11:04:56 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r535460 - head/devel/py-yaml
Message-ID:  <202005161104.04GB4uSd029217@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
 .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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005161104.04GB4uSd029217>