Index: devel/py-pyyaml5/Makefile
===================================================================
--- devel/py-pyyaml5/Makefile
+++ devel/py-pyyaml5/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pyyaml
 PORTVERSION=	5.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -39,7 +40,7 @@
 .endif
 
 post-install-EXAMPLES-on:
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}${PKGNAMESUFFIX}/)
 
 post-install-LIBYAML-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/yaml/_yaml*.so
Index: devel/py-pyyaml5/pkg-plist
===================================================================
--- devel/py-pyyaml5/pkg-plist
+++ devel/py-pyyaml5/pkg-plist
@@ -1,4 +1,4 @@
-%%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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%%%PKGNAMESUFFIX%%/pygments-lexer/example.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%%%PKGNAMESUFFIX%%/pygments-lexer/yaml.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%%%PKGNAMESUFFIX%%/yaml-highlight/yaml_hl.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%%%PKGNAMESUFFIX%%/yaml-highlight/yaml_hl.py