Attachment 103783 Details for Bug 143799 – file.diff

[patch] file.diff

file.diff (text/plain), 5.56 KB, created by hizel on 2010-02-11 11:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hizel

Created: 2010-02-11 11:40:01 UTC

Size: 5.56 KB

patch

obsolete

>diff -r c7129e4d3300 -r 4c76dc9edccf sysutils/py-supervisor/Makefile
>--- a/sysutils/py-supervisor/Makefile   Wed Feb 10 12:31:24 2010 +0300
>+++ b/sysutils/py-supervisor/Makefile   Thu Feb 11 14:26:42 2010 +0300
>@@ -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,18 @@
> 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}meld3>=0.6.4:${PORTSDIR}/www/py-meld3
>+
>+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 -r c7129e4d3300 -r 4c76dc9edccf sysutils/py-supervisor/distinfo
>--- a/sysutils/py-supervisor/distinfo   Wed Feb 10 12:31:24 2010 +0300
>+++ b/sysutils/py-supervisor/distinfo   Thu Feb 11 14:26:42 2010 +0300
>@@ -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 -r c7129e4d3300 -r 4c76dc9edccf sysutils/py-supervisor/pkg-plist
>--- a/sysutils/py-supervisor/pkg-plist  Wed Feb 10 12:31:24 2010 +0300
>+++ b/sysutils/py-supervisor/pkg-plist  Thu Feb 11 14:26:42 2010 +0300
>@@ -2,14 +2,6 @@
> 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 @@
> %%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 @@
> %%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 @@
> %%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,5 @@
> @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc
> @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
> @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
>-
>+@stopdaemon supervisord
>+@unexec rm -rf /var/run/supervisor

Actions: View | Diff

Attachments on bug 143799: 103783