svn commit: r480364 - in head/sysutils/py-supervisor: . files

[Wen Heping]

Author: wen
Date: Sat Sep 22 08:26:51 2018
New Revision: 480364
URL: https://svnweb.freebsd.org/changeset/ports/480364

Log:
  - Update to 3.3.4
  
  PR:		230711
  Submitted by:	sergey at akhmatov.ru
  Approved by:	maintainer(timeout, > 30 days)
  Differential Revision:	https://reviews.freebsd.org/D16776

Added:
  head/sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py   (contents, props changed)
Deleted:
  head/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py
  head/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py
  head/sysutils/py-supervisor/pkg-plist
Modified:
  head/sysutils/py-supervisor/Makefile
  head/sysutils/py-supervisor/distinfo
  head/sysutils/py-supervisor/files/patch-supervisor_options.py

Modified: head/sysutils/py-supervisor/Makefile
==============================================================================
--- head/sysutils/py-supervisor/Makefile	Sat Sep 22 08:24:44 2018	(r480363)
+++ head/sysutils/py-supervisor/Makefile	Sat Sep 22 08:26:51 2018	(r480364)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	supervisor
-PORTVERSION=	3.3.3
+PORTVERSION=	3.3.4
 PORTEPOCH=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
@@ -14,30 +14,35 @@ COMMENT=	System for controlling process state under UN
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${PY_FLAVOR}
 
-PORTDOCS=	*.txt *.rst
-
-NO_ARCH=	yes
-
 USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils autoplist
 PIDDIR?=	/var/run/supervisor
 
+NO_ARCH=	yes
+PLIST_FILES=	'@sample etc/supervisord.conf.sample'
+PLIST_DIRS=	${PIDDIR}
+
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		PIDDIR=${PIDDIR}
 PLIST_SUB=	PIDDIR=${PIDDIR}
 USE_RC_SUBR=	supervisord
 
 SHEBANG_FILES=	supervisor/scripts/*.py supervisor/tests/fixtures/*.py
-python_OLD_CMD=	"/usr/bin/env python"
 python_OLD_CMD+=	"<<PYTHON>>"
 
+PORTDOCS=	*.txt *.rst
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py
+	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py \
+		${WRKSRC}/supervisor/tests/test_options.py
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/supervisord.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL} -d ${STAGEDIR}${PIDDIR}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/

Modified: head/sysutils/py-supervisor/distinfo
==============================================================================
--- head/sysutils/py-supervisor/distinfo	Sat Sep 22 08:24:44 2018	(r480363)
+++ head/sysutils/py-supervisor/distinfo	Sat Sep 22 08:26:51 2018	(r480364)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505483926
-SHA256 (supervisor-3.3.3.tar.gz) = 96287ebfabf9a6923f74123b056c4da39c617fef367980f007cac02fba6527ad
-SIZE (supervisor-3.3.3.tar.gz) = 418354
+TIMESTAMP = 1534438600
+SHA256 (supervisor-3.3.4.tar.gz) = 212201a3fd1d35c150ef0c35bf0676fd1a6c195fb60bf0f2147fe7dbd317e672
+SIZE (supervisor-3.3.4.tar.gz) = 419794

Modified: head/sysutils/py-supervisor/files/patch-supervisor_options.py
==============================================================================
--- head/sysutils/py-supervisor/files/patch-supervisor_options.py	Sat Sep 22 08:24:44 2018	(r480363)
+++ head/sysutils/py-supervisor/files/patch-supervisor_options.py	Sat Sep 22 08:26:51 2018	(r480364)
@@ -1,5 +1,5 @@
---- supervisor/options.py.orig	2016-06-08 17:09:41.213297000 +0300
-+++ supervisor/options.py	2016-06-08 17:10:18.970354000 +0300
+--- supervisor/options.py.orig	2018-02-15 21:18:33 UTC
++++ supervisor/options.py
 @@ -96,13 +96,7 @@ class Options:
          self.add("configfile", None, "c:", "configuration=")
  

Added: head/sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py	Sat Sep 22 08:26:51 2018	(r480364)
@@ -0,0 +1,18 @@
+--- supervisor/tests/test_options.py.orig	2018-02-15 21:31:47 UTC
++++ supervisor/tests/test_options.py
+@@ -160,12 +160,9 @@ class OptionTests(unittest.TestCase):
+ 
+     def test_searchpaths(self):
+         options = self._makeOptions()
+-        self.assertEqual(len(options.searchpaths), 6)
+-        self.assertEqual(options.searchpaths[-4:], [
+-            'supervisord.conf',
+-            'etc/supervisord.conf',
+-            '/etc/supervisord.conf',
+-            '/etc/supervisor/supervisord.conf',
++        self.assertEqual(len(options.searchpaths), 1)
++        self.assertEqual(options.searchpaths[-1:], [
++            '%%PREFIX%%/etc/supervisord.conf',
+             ])
+ 
+     def test_options_and_args_order(self):