- Update to 0.5.1

  * 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 unconditional to stage
- Unmute INSTALL_DATA and INSTALL_MAN in post-install target

PR:		ports/188882 (based on)
Submitted by:	Bartek Rutkowski <ports@robakdesign.com>

3 files changed, 21 insertions, 95 deletions

diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 8c034130c043..b37badc1dba8 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actdiag
-PORTVERSION=	0.4.3
+PORTVERSION=	0.5.1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,40 +12,29 @@ COMMENT=	Simple activity-diagram image generator
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
-		${PKGNAMEPREFIX}blockdiag>=1.2.4:${PORTSDIR}/graphics/py-blockdiag \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.4:${PORTSDIR}/devel/py-funcparserlib
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
+		${PKGNAMEPREFIX}blockdiag>=1.3.1:${PORTSDIR}/graphics/py-blockdiag \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-
-MAN1=	${PORTNAME}.1
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-PORTDOCS=	README.txt
-
-NO_STAGE=	yes
+PORTDOCS=	README.rst
 
 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
-	@${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}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${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-actdiag/distinfo b/graphics/py-actdiag/distinfo
index 248b888f634b..ce9092061a9d 100644
--- a/graphics/py-actdiag/distinfo
+++ b/graphics/py-actdiag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (actdiag-0.4.3.tar.gz) = a52385bb0c1631bb70621706b7680382a8d5cb48612649cc502c36db7919d9c7
-SIZE (actdiag-0.4.3.tar.gz) = 23004
+SHA256 (actdiag-0.5.1.tar.gz) = 84de54e1c3c1b09f173fd072a2c37af7ed2813b9a343bd0fd324545db5636b29
+SIZE (actdiag-0.5.1.tar.gz) = 22823
diff --git a/graphics/py-actdiag/pkg-plist b/graphics/py-actdiag/pkg-plist
deleted file mode 100644
index 455ab99c1b13..000000000000
--- a/graphics/py-actdiag/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-bin/actdiag
-%%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%%/actdiag/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/builder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/builder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/builder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/command.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/command.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/command.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/drawer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/drawer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/drawer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/elements.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/elements.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/elements.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/metrics.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/metrics.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/metrics.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins/autolane.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins/autolane.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins/autolane.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests/test_pep8.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests/test_pep8.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests/test_pep8.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests/test_rst_directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests/test_rst_directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests/test_rst_directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/nodes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/nodes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst/nodes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag_sphinxhelper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag_sphinxhelper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag_sphinxhelper.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils/rst
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/utils
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/actdiag
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%