4 files changed, 26 insertions, 43 deletions

diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index aecf5fccfdd7..1d4082059a36 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -7,18 +7,22 @@
 #
 
 PORTNAME=	yaml
-PORTVERSION=	0.32
+PORTVERSION=	3.01
 CATEGORIES=	devel python
-MASTER_SITES=	http://pyyaml.org/download/pyyaml-legacy/
+MASTER_SITES=	http://pyyaml.org/download/pyyaml/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	PyYaml-SHowell-${PORTVERSION}
-EXTRACT_SUFX=	.tar.gz
+DISTNAME=	PyYAML-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python YAML parser
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-WRKSRC=		${WRKDIR}/PyYaml
+
+post-install:
+	@${FIND} ${PYTHON_SITELIBDIR}/yaml ! -type d | \
+		${SED} -e "s,^${PREFIX}/,," >> ${TMPPLIST}
+	@${FIND} ${PYTHON_SITELIBDIR}/yaml -type d | ${SORT} -r | \
+		${SED} -e "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/py-yaml/distinfo b/devel/py-yaml/distinfo
index 70d54fb74e46..0d8b88ced80e 100644
--- a/devel/py-yaml/distinfo
+++ b/devel/py-yaml/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyYaml-SHowell-0.32.tar.gz) = e3a147d1a1e19861fe6b3f63f4100b24
-SHA256 (PyYaml-SHowell-0.32.tar.gz) = 29266dcc9380d7c68f13a837b49cbc0ae609e61d2ec6d4cdd246c9f9cf2b415a
-SIZE (PyYaml-SHowell-0.32.tar.gz) = 55629
+MD5 (PyYAML-3.01.tar.gz) = 981339891fa403a6fd93c5ce1b479387
+SHA256 (PyYAML-3.01.tar.gz) = 0067b2cc78bcfef067b7f4d8af2426f5aaf95356382923b234bc05ec52242823
+SIZE (PyYAML-3.01.tar.gz) = 36721
diff --git a/devel/py-yaml/pkg-descr b/devel/py-yaml/pkg-descr
index e5a3af58c3ef..0d9079bae2ba 100644
--- a/devel/py-yaml/pkg-descr
+++ b/devel/py-yaml/pkg-descr
@@ -1,3 +1,16 @@
-Python YAML parser
+PyYAML is a YAML parser and emitter for the Python programming language.
+
+PyYAML features :
+   * a complete YAML 1.1 parser. In particular, PyYAML can parse all examples
+     from the specification. The parsing algorithm is simple enough to be a
+     reference for YAML parser implementors.
+   * Unicode support including UTF-8/UTF-16 input/output and \u escape
+     sequences.
+   * low-level event-based parser and emitter API (like SAX).
+   * high-level API for serializing and deserializing native Python objects
+     (like DOM or pickle).
+   * support for all types from the YAML types repository. A simple extension
+     API is provided.
+   * relatively sensible error messages.
 
 WWW: http://pyyaml.org/
diff --git a/devel/py-yaml/pkg-plist b/devel/py-yaml/pkg-plist
deleted file mode 100644
index 9fc7e7d058d6..000000000000
--- a/devel/py-yaml/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-%%PYTHON_SITELIBDIR%%/yaml/__init__.py
-%%PYTHON_SITELIBDIR%%/yaml/__init__.pyc
-%%PYTHON_SITELIBDIR%%/yaml/__init__.pyo
-%%PYTHON_SITELIBDIR%%/yaml/dump.py
-%%PYTHON_SITELIBDIR%%/yaml/dump.pyc
-%%PYTHON_SITELIBDIR%%/yaml/dump.pyo
-%%PYTHON_SITELIBDIR%%/yaml/implicit.py
-%%PYTHON_SITELIBDIR%%/yaml/implicit.pyc
-%%PYTHON_SITELIBDIR%%/yaml/implicit.pyo
-%%PYTHON_SITELIBDIR%%/yaml/inline.py
-%%PYTHON_SITELIBDIR%%/yaml/inline.pyc
-%%PYTHON_SITELIBDIR%%/yaml/inline.pyo
-%%PYTHON_SITELIBDIR%%/yaml/klass.py
-%%PYTHON_SITELIBDIR%%/yaml/klass.pyc
-%%PYTHON_SITELIBDIR%%/yaml/klass.pyo
-%%PYTHON_SITELIBDIR%%/yaml/load.py
-%%PYTHON_SITELIBDIR%%/yaml/load.pyc
-%%PYTHON_SITELIBDIR%%/yaml/load.pyo
-%%PYTHON_SITELIBDIR%%/yaml/ordered_dict.py
-%%PYTHON_SITELIBDIR%%/yaml/ordered_dict.pyc
-%%PYTHON_SITELIBDIR%%/yaml/ordered_dict.pyo
-%%PYTHON_SITELIBDIR%%/yaml/redump.py
-%%PYTHON_SITELIBDIR%%/yaml/redump.pyc
-%%PYTHON_SITELIBDIR%%/yaml/redump.pyo
-%%PYTHON_SITELIBDIR%%/yaml/stream.py
-%%PYTHON_SITELIBDIR%%/yaml/stream.pyc
-%%PYTHON_SITELIBDIR%%/yaml/stream.pyo
-%%PYTHON_SITELIBDIR%%/yaml/timestamp.py
-%%PYTHON_SITELIBDIR%%/yaml/timestamp.pyc
-%%PYTHON_SITELIBDIR%%/yaml/timestamp.pyo
-%%PYTHON_SITELIBDIR%%/yaml/ypath.py
-%%PYTHON_SITELIBDIR%%/yaml/ypath.pyc
-%%PYTHON_SITELIBDIR%%/yaml/ypath.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/yaml