svn commit: r521955 - in head/www: py-puppetboard py-puppetboard/files py-puppetboard02 py-puppetboard03

[Romain Tartière]

Author: romain
Date: Fri Jan  3 19:47:56 2020
New Revision: 521955
URL: https://svnweb.freebsd.org/changeset/ports/521955

Log:
  Unify and update www/py-puppetboard to 1.1.0
  
  PR:		243028
  Reported by:	romain
  Approved by:	allanjude
  With hat:	puppet

Added:
  head/www/py-puppetboard/files/
     - copied from r518259, head/www/py-puppetboard03/files/
Modified:
  head/www/py-puppetboard/Makefile
  head/www/py-puppetboard/distinfo
  head/www/py-puppetboard02/Makefile
  head/www/py-puppetboard03/Makefile

Modified: head/www/py-puppetboard/Makefile
==============================================================================
--- head/www/py-puppetboard/Makefile	Fri Jan  3 19:39:59 2020	(r521954)
+++ head/www/py-puppetboard/Makefile	Fri Jan  3 19:47:56 2020	(r521955)
@@ -1,31 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	puppetboard
-PORTVERSION=	0.0.4
+PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	allanjude at FreeBSD.org
+MAINTAINER=	puppet at FreeBSD.org
 COMMENT=	Web interface to PuppetDB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.3.3:databases/py-pypuppetdb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR}
 
-CONFLICTS_INSTALL=puppetboard02-* puppetboard03-*
+USES=		python
 USE_GITHUB=	yes
-GH_ACCOUNT=	voxpupuli
-
-USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
+CONFLICTS_INSTALL=puppetboard02-* puppetboard03-*
+
+GH_ACCOUNT=	voxpupuli
 PLIST_FILES=	"@sample etc/puppetboard/default_settings.py.sample"
+
+post-patch:
+	${REINPLACE_CMD} -e '/requirements_for_tests/,+2d' \
+		${WRKSRC}/setup.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppetboard

Modified: head/www/py-puppetboard/distinfo
==============================================================================
--- head/www/py-puppetboard/distinfo	Fri Jan  3 19:39:59 2020	(r521954)
+++ head/www/py-puppetboard/distinfo	Fri Jan  3 19:47:56 2020	(r521955)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476513137
-SHA256 (voxpupuli-puppetboard-v0.0.4_GH0.tar.gz) = 95ce69e4b017d56d38b7ea8aa2ca131b7702a18228c68d41fcfd0d7080732817
-SIZE (voxpupuli-puppetboard-v0.0.4_GH0.tar.gz) = 2851486
+TIMESTAMP = 1577856625
+SHA256 (voxpupuli-puppetboard-v1.1.0_GH0.tar.gz) = 74b63b6ed5af4e06a6ac9513516273843af7ad0fd6b806f50c9bb79a1944c598
+SIZE (voxpupuli-puppetboard-v1.1.0_GH0.tar.gz) = 2277196

Modified: head/www/py-puppetboard02/Makefile
==============================================================================
--- head/www/py-puppetboard02/Makefile	Fri Jan  3 19:39:59 2020	(r521954)
+++ head/www/py-puppetboard02/Makefile	Fri Jan  3 19:47:56 2020	(r521955)
@@ -13,7 +13,8 @@ COMMENT=	Web interface to PuppetDB
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DEPRECATED=	Consider switching to www/py-puppetboard03
+DEPRECATED=	Use www/py-puppetboard instead
+EXPIRATION_DATE=2020-04-01
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${PY_FLAVOR} \

Modified: head/www/py-puppetboard03/Makefile
==============================================================================
--- head/www/py-puppetboard03/Makefile	Fri Jan  3 19:39:59 2020	(r521954)
+++ head/www/py-puppetboard03/Makefile	Fri Jan  3 19:47:56 2020	(r521955)
@@ -14,6 +14,9 @@ COMMENT=	Web interface to PuppetDB
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Use www/py-puppetboard instead
+EXPIRATION_DATE=2020-04-01
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \