ports/143799: [MANTAINER UPDATE] sysutils/py-supervisor update
to 3.0a8 bug fix release
Hizel Ildar
hizel at vyborg.ru
Fri Feb 19 12:30:04 UTC 2010
The following reply was made to PR ports/143799; it has been noted by GNATS.
From: Hizel Ildar <hizel at vyborg.ru>
To: bug-followup at FreeBSD.org
Cc: Li-Wen Hsu <lwhsu at FreeBSD.org>
Subject: Re: ports/143799: [MANTAINER UPDATE] sysutils/py-supervisor update
to 3.0a8 bug fix release
Date: Fri, 19 Feb 2010 15:25:49 +0300
sorry :(
fixing rc script
fixing pkg-plist: add @exec mkdir /var/run
adding to RUN_DEPEND cElementTree because the daemon to issue a warning but it works
>WARN cElementTree not installed, using slower XML parser for XML-RPC
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index d3fe85c..19990f7 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= supervisor
-PORTVERSION= 3.0a7
+PORTVERSION= 3.0a8
CATEGORIES= sysutils python
MASTER_SITES= http://dist.supervisord.org/\
CHEESESHOP
@@ -18,8 +18,19 @@ COMMENT= System to monitor and control a number of processes on UNIX-like OS
USE_PYTHON= 2.4+
USE_PYDISTUTILS= easy_install
+SUB_LIST= PYTHONVER=${PYTHON_VERSION}
+USE_RC_SUBR= supervisord
+
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elementtree>=1.2.6:${PORTSDIR}/devel/py-elementtree \
${PYTHON_PKGNAMEPREFIX}meld3>=0.6.4:${PORTSDIR}/www/py-meld3 \
- ${PYTHON_PKGNAMEPREFIX}medusa>=0.5.4:${PORTSDIR}/net/py-medusa
+ ${PYTHON_PKGNAMEPREFIX}cElementTree>=1.0.5:${PORTSDIR}/devel/py-celementtree
+
+post-install:
+ [ -d /var/run/supervisor ] || ${MKDIR} /var/run/supervisor
+ [ -f ${PREFIX}/etc/supervisord.conf ] || \
+ ( ${PREFIX}/bin/echo_supervisord_conf > ${PREFIX}/etc/supervisord.conf && \
+ ${REINPLACE_CMD} -e 's!/tmp/supervisor.sock!/var/run/supervisor/supervisor.sock!g' \
+ -e 's!/tmp/supervisord.log!/var/log/supervisord.log!g' -e 's!/tmp/supervisord.pid!/var/run/supervisor/supervisord.pid!g' \
+ -e 's!unix:///tmp/supervisor.sock!unix:///var/run/supervisor/supervisor.sock!g' ${PREFIX}/etc/supervisord.conf )
.include <bsd.port.mk>
diff --git a/sysutils/py-supervisor/distinfo b/sysutils/py-supervisor/distinfo
index b99c658..c4bfe0e 100644
--- a/sysutils/py-supervisor/distinfo
+++ b/sysutils/py-supervisor/distinfo
@@ -1,3 +1,3 @@
-MD5 (supervisor-3.0a7.tar.gz) = d2e6c491fcb2606e4fd0afe4ebfd4b13
-SHA256 (supervisor-3.0a7.tar.gz) = 4c4e48f94298e80e21209458d57471c19c40b3e1993f6e780f31826192eaff99
-SIZE (supervisor-3.0a7.tar.gz) = 292408
+MD5 (supervisor-3.0a8.tar.gz) = 7a775455f3a53c2ea375d18dcfe9e522
+SHA256 (supervisor-3.0a8.tar.gz) = ce61afd01780ffba3e40ec244205b6db309da3b84ef27b5c5b179456050e5b8b
+SIZE (supervisor-3.0a8.tar.gz) = 287705
diff --git a/sysutils/py-supervisor/files/patch-aa b/sysutils/py-supervisor/files/patch-aa
new file mode 100644
index 0000000..94fc597
--- /dev/null
+++ b/sysutils/py-supervisor/files/patch-aa
@@ -0,0 +1,11 @@
+--- src/supervisor/options.py.orig 2010-02-11 13:25:24.000000000 +0300
++++ src/supervisor/options.py 2010-02-11 13:25:55.000000000 +0300
+@@ -105,7 +105,7 @@
+ def default_configfile(self):
+ """Return the name of the found config file or raise. """
+ paths = ['supervisord.conf', 'etc/supervisord.conf',
+- '/etc/supervisord.conf']
++ '/etc/supervisord.conf', '/usr/local/etc/supervisord.conf']
+ config = None
+ for path in paths:
+ if os.path.exists(path):
diff --git a/sysutils/py-supervisor/files/supervisord.in b/sysutils/py-supervisor/files/supervisord.in
new file mode 100644
index 0000000..97408a6
--- /dev/null
+++ b/sysutils/py-supervisor/files/supervisord.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# PROVIDE: supervisord
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable trac:
+# supervisord_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+# Set some defaults
+supervisord_enable=${supervisord_enable:-"NO"}
+supervisord_pid=${supervisord_pid:-"/var/run/supervisor/supervisord.pid"}
+
+name=supervisord
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+pidfile=${supervisord_pid}
+command="%%PREFIX%%/bin/supervisord"
+command_interpreter="/usr/local/bin/%%PYTHONVER%%"
+
+run_rc_command "$1"
+
diff --git a/sysutils/py-supervisor/pkg-plist b/sysutils/py-supervisor/pkg-plist
index 595ec79..5eeedda 100644
--- a/sysutils/py-supervisor/pkg-plist
+++ b/sysutils/py-supervisor/pkg-plist
@@ -2,14 +2,6 @@ bin/echo_supervisord_conf
bin/pidproxy
bin/supervisorctl
bin/supervisord
-%%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/._namespace_packages.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%%/EGG-INFO/PKG-INFO
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
@@ -278,6 +270,9 @@ bin/supervisord
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_childutils.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_childutils.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_childutils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_confecho.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_confecho.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_confecho.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_datatypes.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_datatypes.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_datatypes.pyo
@@ -293,9 +288,6 @@ bin/supervisord
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_loggers.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_loggers.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_loggers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_memmon.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_memmon.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_memmon.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_options.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_options.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_options.pyo
@@ -308,6 +300,9 @@ bin/supervisord
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_socket_manager.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_socket_manager.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_socket_manager.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_states.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_states.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_states.pyo
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_supervisorctl.py
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_supervisorctl.pyc
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/tests/test_supervisorctl.pyo
@@ -359,4 +354,6 @@ bin/supervisord
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-
+ at stopdaemon supervisord
+ at exec mkdir -p /var/run/supervisor
+ at unexec rm -rf /var/run/supervisor
More information about the freebsd-python
mailing list