- Update to 0.9.0

  * Switch run-time dependency from PIL to Pillow
- Use USE_PYDISTUTILS= yes instead of USE_PYDISTUTILS= easy_install
- Use PYDISTUTILS_AUTOPLIST
  * Remove pkg-plist, accordingly
- Support STAGEDIR
  * Make DOCS and EXAMPLES unconditional to stage
- Unmute INSTALL_DATA and INSTALL_MAN in post-install target

3 files changed, 22 insertions, 100 deletions

diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index 21ad91830fd5..d1f7ba884d55 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seqdiag
-PORTVERSION=	0.8.2
+PORTVERSION=	0.9.0
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,47 +12,34 @@ COMMENT=	Simple sequence-diagram image generator
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.4:${PORTSDIR}/devel/py-funcparserlib \
-		${PKGNAMEPREFIX}blockdiag>=1.2.4:${PORTSDIR}/graphics/py-blockdiag
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \
+		${PKGNAMEPREFIX}blockdiag>=1.3.0:${PORTSDIR}/graphics/py-blockdiag
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
 
-MAN1=	${PORTNAME}.1
-
 PORTDOCS=	README.txt
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/src/${PORTDOCS} ${DOCSDIR}
+.if ${PYTHON_VER} == 3.1
+IGNORE=	does not support in ${PYTHON_VERSION}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/examples/${PORTEXAMPLES} ${EXAMPLESDIR}
-.endif
-	@${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/
-
-x-generate-plist:
-	${ECHO} bin/${PORTNAME} > pkg-plist.new
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} -type f | ${SORT} | \
-	${SED} -e 's,${PYTHON_SITELIBDIR},%%PYTHON_SITELIBDIR%%,' \
-		-e 's,${PYEASYINSTALL_EGG},%%PYEASYINSTALL_EGG%%,' \
-		>> pkg-plist.new
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} -type d -depth | ${SORT} -r | \
-	${SED} -e 's,${PYTHON_SITELIBDIR},@dirrm %%PYTHON_SITELIBDIR%%,' \
-		-e 's,${PYEASYINSTALL_EGG},%%PYEASYINSTALL_EGG%%,' \
-		>> pkg-plist.new
-
-.include <bsd.port.mk>
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/examples/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
+	@${ECHO_CMD} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST}
+
+.include <bsd.port.post.mk>
diff --git a/graphics/py-seqdiag/distinfo b/graphics/py-seqdiag/distinfo
index e8b11b524782..9638326f9ac5 100644
--- a/graphics/py-seqdiag/distinfo
+++ b/graphics/py-seqdiag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seqdiag-0.8.2.tar.gz) = 73079ae62077bad05d95f0499a7edd9b1d9068e52648b164f57c82183efcea10
-SIZE (seqdiag-0.8.2.tar.gz) = 31251
+SHA256 (seqdiag-0.9.0.tar.gz) = 46cb821d83997d0f06c23db44de88f64bb7aeea28cec330cf353c44d8fa849f7
+SIZE (seqdiag-0.9.0.tar.gz) = 28887
diff --git a/graphics/py-seqdiag/pkg-plist b/graphics/py-seqdiag/pkg-plist
deleted file mode 100644
index 40238bbf71af..000000000000
--- a/graphics/py-seqdiag/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-bin/seqdiag
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/builder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/builder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/builder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/command.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/command.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/command.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/drawer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/drawer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/drawer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/elements.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/elements.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/elements.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/metrics.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/metrics.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/metrics.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_builder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_builder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_builder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_generate_diagram.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_generate_diagram.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_generate_diagram.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_pep8.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_pep8.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_pep8.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_rst_directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_rst_directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/test_rst_directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/nodes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/nodes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst/nodes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag_sphinxhelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag_sphinxhelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag_sphinxhelper.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils/rst
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/utils
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/seqdiag
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%