4 files changed, 35 insertions, 31 deletions

diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile
index 0e3c853a78b0..8e6435981b12 100644
--- a/sysutils/py-zdaemon/Makefile
+++ b/sysutils/py-zdaemon/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	zdaemon
-# Date created:		22 Nov, 2008
-# Whom:			Wen Heping <wenheping@gmail.com>
+# Date created:				22 Nov, 2008
+# Whom:					Wen Heping <wenheping@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zdaemon
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.7
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,10 +14,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Daemon Process Control Library and Tools for Unix-bases Systems
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:${PORTSDIR}/devel/py-zconfig
-RUN_DEPENDS:=	${BUILDS_DEPENDS}
+LICENSE=	ZPL21
 
-USE_PYTHON=	2.4+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>0:${PORTSDIR}/devel/py-zconfig
+
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-zdaemon/distinfo b/sysutils/py-zdaemon/distinfo
index fa0d1a768531..fbbd6df2bdcb 100644
--- a/sysutils/py-zdaemon/distinfo
+++ b/sysutils/py-zdaemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zdaemon-2.0.4.tar.gz) = 37d9ab90128223353e48d1f5684fb2385a9b5b16539f73aeefe7183bdecc59ab
-SIZE (zdaemon-2.0.4.tar.gz) = 42422
+SHA256 (zdaemon-2.0.7.tar.gz) = 28a96152a62823052359bac7d01a375029146d31310877408bd0a91624411eb8
+SIZE (zdaemon-2.0.7.tar.gz) = 48037
diff --git a/sysutils/py-zdaemon/pkg-descr b/sysutils/py-zdaemon/pkg-descr
index 020e98fef2d6..c94143fa3098 100644
--- a/sysutils/py-zdaemon/pkg-descr
+++ b/sysutils/py-zdaemon/pkg-descr
@@ -5,4 +5,4 @@ for Zope / ZEO, although it is not limited to running Python-based
 applications (for instance, it has been used to manage the
 'spread' daemon).
 
-WWW: http://www.python.org/pypi/zdaemon
+WWW:	http://pypi.python.org/pypi/zdaemon
diff --git a/sysutils/py-zdaemon/pkg-plist b/sysutils/py-zdaemon/pkg-plist
index 81299f52bcf6..18c68d9d3e65 100644
--- a/sysutils/py-zdaemon/pkg-plist
+++ b/sysutils/py-zdaemon/pkg-plist
@@ -1,37 +1,40 @@
 bin/zdaemon
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdctl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdoptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdrun.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/README.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/component.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/sample.conf
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/schema.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdctl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdoptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdrun.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdrun.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdoptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/parent.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/nokill.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdrun.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdoptions.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/parent.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/nokill.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdrun.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdoptions.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/nokill.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/nokill.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/nokill.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/parent.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/parent.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/parent.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/tests.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/tests.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/nokill.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testuser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testuser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testuser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdoptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdoptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdoptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdrun.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdrun.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/tests/testzdrun.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdctl.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdctl.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdctl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdoptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdoptions.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdoptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdrun.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdrun.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zdaemon/zdrun.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt