5 files changed, 23 insertions, 22 deletions

diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index f5934c3bf1e5..ea182a10ee8c 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	supervisor
-PORTVERSION=	3.0a10
-PORTREVISION=	1
+PORTVERSION=	3.0a12
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://dist.supervisord.org/ \
 		CHEESESHOP
@@ -18,6 +17,8 @@ COMMENT=	System to monitor and control a number of processes on UNIX-like OS
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.4:${PORTSDIR}/www/py-meld3
 
+PORTDOCS=	*.txt *.rst
+
 USE_PYTHON=	2.5-2.7
 USE_PYDISTUTILS=	easy_install
 PIDDIR?=	/var/run/supervisor
@@ -28,11 +29,17 @@ PLIST_SUB=	PIDDIR=${PIDDIR}
 USE_RC_SUBR=	supervisord
 
 post-patch:
-	${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/src/supervisor/options.py
+	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py
 
 post-install:
 	[ -d ${PIDDIR} ] || ${MKDIR} ${PIDDIR}
 	${INSTALL_DATA} ${FILESDIR}/supervisord.conf.sample ${PREFIX}/etc
 	[ -f ${PREFIX}/etc/supervisord.conf ] || ${CP} -p ${PREFIX}/etc/supervisord.conf.sample ${PREFIX}/etc/supervisord.conf
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-supervisor/distinfo b/sysutils/py-supervisor/distinfo
index 426774a160ca..ee4897c1ae2a 100644
--- a/sysutils/py-supervisor/distinfo
+++ b/sysutils/py-supervisor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (supervisor-3.0a10.tar.gz) = 63620d0431bafff6f346fb4df5d9a7745588b5dee1ca5fec2ddff2298107d69f
-SIZE (supervisor-3.0a10.tar.gz) = 438362
+SHA256 (supervisor-3.0a12.tar.gz) = de60eee3c460b379aa8493083b59d31b29f2c4267730db29b6f9dea22642b3b4
+SIZE (supervisor-3.0a12.tar.gz) = 438901
diff --git a/sysutils/py-supervisor/files/patch-src-supervisor-options.py b/sysutils/py-supervisor/files/patch-supervisor_options.py
index bdee95882019..6a91ec1009b5 100644
--- a/sysutils/py-supervisor/files/patch-src-supervisor-options.py
+++ b/sysutils/py-supervisor/files/patch-supervisor_options.py
@@ -1,6 +1,6 @@
---- src/supervisor/options.py.orig	2010-08-14 02:34:50.000000000 +0800
-+++ src/supervisor/options.py	2010-11-23 02:33:20.000000000 +0800
-@@ -105,10 +105,7 @@
+--- supervisor/options.py.orig	2012-01-10 12:55:20.000000000 +0300
++++ supervisor/options.py	2012-01-10 12:56:14.000000000 +0300
+@@ -92,10 +92,7 @@
      def default_configfile(self):
          """Return the name of the found config file or raise. """
          here = os.path.dirname(os.path.dirname(sys.argv[0]))
diff --git a/sysutils/py-supervisor/files/supervisord.in b/sysutils/py-supervisor/files/supervisord.in
index 9c9390146891..df4410425b20 100644
--- a/sysutils/py-supervisor/files/supervisord.in
+++ b/sysutils/py-supervisor/files/supervisord.in
@@ -2,15 +2,15 @@
 
 # $FreeBSD$
 #
-# PROVIDE: supervisord 
+# PROVIDE: supervisord
 # REQUIRE: DAEMON
-# KEYWORD: shutdown 
-# 
+# KEYWORD: shutdown
+#
 # Add the following line to /etc/rc.conf.local or /etc/rc.conf
-# to enable supervisord: 
+# to enable supervisord:
+#
+# supervisord_enable="YES"
 #
-# supervisord_enable="YES" 
-# 
 
 . /etc/rc.subr
 
@@ -21,8 +21,8 @@ command="%%PREFIX%%/bin/${name}"
 command_interpreter="%%PYTHON_CMD%%"
 pidfile="%%PIDDIR%%/${name}.pid"
 
-load_rc_config $name 
+load_rc_config $name
 
-: ${supervisord_enable="NO"} 
+: ${supervisord_enable="NO"}
 
 run_rc_command "$1"
diff --git a/sysutils/py-supervisor/pkg-plist b/sysutils/py-supervisor/pkg-plist
index 60d403f48d4f..5b8ea10308e0 100644
--- a/sysutils/py-supervisor/pkg-plist
+++ b/sysutils/py-supervisor/pkg-plist
@@ -12,11 +12,6 @@ etc/supervisord.conf.sample
 %%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%%/doc/CHANGES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/COPYRIGHT.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/LICENSES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/TODO.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/__init__.pyo
@@ -353,7 +348,6 @@ etc/supervisord.conf.sample
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/medusa/debian
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/medusa
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 @stopdaemon supervisord