diff -ruN py-supervisor.old/Makefile py-supervisor/Makefile
--- py-supervisor.old/Makefile	2012-01-10 12:51:31.000000000 +0300
+++ py-supervisor/Makefile	2012-01-10 14:00:56.000000000 +0300
@@ -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 @@
 
 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 @@
 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 -ruN py-supervisor.old/distinfo py-supervisor/distinfo
--- py-supervisor.old/distinfo	2012-01-10 12:51:31.000000000 +0300
+++ py-supervisor/distinfo	2012-01-10 12:53:22.000000000 +0300
@@ -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 -ruN py-supervisor.old/files/patch-src-supervisor-options.py py-supervisor/files/patch-src-supervisor-options.py
--- py-supervisor.old/files/patch-src-supervisor-options.py	2012-01-10 12:51:31.000000000 +0300
+++ py-supervisor/files/patch-src-supervisor-options.py	1970-01-01 03:00:00.000000000 +0300
@@ -1,14 +0,0 @@
---- 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 @@
-     def default_configfile(self):
-         """Return the name of the found config file or raise. """
-         here = os.path.dirname(os.path.dirname(sys.argv[0]))
--        paths = [os.path.join(here, 'etc', 'supervisord.conf'),
--                 os.path.join(here, 'supervisord.conf'),
--                 'supervisord.conf', 'etc/supervisord.conf',
--                 '/etc/supervisord.conf']
-+        paths = [ '%%PREFIX%%/etc/supervisord.conf' ]
-         config = None
-         for path in paths:
-             if os.path.exists(path):
diff -ruN py-supervisor.old/files/patch-supervisor-options.py py-supervisor/files/patch-supervisor-options.py
--- py-supervisor.old/files/patch-supervisor-options.py	1970-01-01 03:00:00.000000000 +0300
+++ py-supervisor/files/patch-supervisor-options.py	2012-01-10 13:00:09.000000000 +0300
@@ -0,0 +1,14 @@
+--- 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]))
+-        paths = [os.path.join(here, 'etc', 'supervisord.conf'),
+-                 os.path.join(here, 'supervisord.conf'),
+-                 'supervisord.conf', 'etc/supervisord.conf',
+-                 '/etc/supervisord.conf']
++        paths = [ '%%PREFIX%%/etc/supervisord.conf' ]
+         config = None
+         for path in paths:
+             if os.path.exists(path):
diff -ruN py-supervisor.old/pkg-plist py-supervisor/pkg-plist
--- py-supervisor.old/pkg-plist	2012-01-10 12:51:31.000000000 +0300
+++ py-supervisor/pkg-plist	2012-01-10 13:26:48.000000000 +0300
@@ -12,11 +12,6 @@
 %%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 @@
 @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