update to puppetboard-0.0.4

www/puppetboard/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2014/01/15 08:41:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2014/01/22 09:21:17 jasper Exp $
 
 COMMENT=		web interface to PuppetDB
 
-# git clone of eadcf8708ccdb6cfa7981f91bee425169d23234b
-DISTNAME=		puppetboard-0.0.1
-REVISION=		2
+MODPY_EGG_VERSION=	0.0.4
+DISTNAME=		puppetboard-${MODPY_EGG_VERSION}
 CATEGORIES=		www
 
 MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -12,7 +11,7 @@ MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
 # Apache2
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		http://distfiles.nl/
+MASTER_SITES=		${MASTER_SITE_PYPI:=p/puppetboard/}
 
 MODULES=		lang/python
 
@@ -21,7 +20,7 @@ NO_TEST=		Yes
 PKG_ARCH=		*
 
 RUN_DEPENDS=		databases/py-puppetdb>=0.1.0 \
-			www/py-flask-wtf \
+			www/py-flask-wtf>=0.9.4p0 \
 			www/py-gunicorn \
 			www/py-requests
 
@@ -29,16 +28,12 @@ PREFIX=			${VARBASE}/www
 INSTDIR=		${PREFIX}/puppetboard
 SUBST_VARS+=		INSTDIR
 
-# Don't bother installing some screenshots of what we're about to run
-post-extract:
-	rm -r ${WRKSRC}/screenshots/
-
 do-install:
 	cp -Rp ${WRKSRC} ${INSTDIR}
 	mv ${INSTDIR}/puppetboard/default_settings.py \
 		${INSTDIR}/puppetboard/default_settings.py.dist
 	${INSTALL_DATA_DIR} ${INSTDIR}/puppetboard/{public,tmp}/
-	mv ${INSTDIR}/wsgi.py ${INSTDIR}/puppetboard_wsgi.py
+	${INSTALL_DATA} ${FILESDIR}/puppetboard_wsgi.py ${INSTDIR}
 	chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
 .include <bsd.port.mk>

www/puppetboard/distinfo

@@ -1,2 +1,2 @@
-SHA256 (puppetboard-0.0.1.tar.gz) = z11oA7SheNHvZ2MLVB+hLe58s9Z/XYMR/SnQKCr53Zs=
-SIZE (puppetboard-0.0.1.tar.gz) = 2850031
+SHA256 (puppetboard-0.0.4.tar.gz) = vOymk59SCoy9KQxdIhdHADMstmST0J5QAe6AyxOsYsg=
+SIZE (puppetboard-0.0.4.tar.gz) = 53854

www/puppetboard/files/puppetboard_wsgi.py

@@ -0,0 +1,15 @@
+# $OpenBSD: puppetboard_wsgi.py,v 1.1 2014/01/22 09:21:17 jasper Exp $
+#
+# WSGI helper script; distributed with Puppetboard up to 0.0.4
+
+from __future__ import absolute_import
+
+import os
+import sys
+
+me = os.path.dirname(os.path.abspath(__file__))
+# Add us to the PYTHONPATH/sys.path if we're not on it
+if not me in sys.path:
+    sys.path.insert(0, me)
+
+from puppetboard.app import app as application

www/puppetboard/patches/patch-puppetboard_app_py

@@ -1,32 +0,0 @@
-$OpenBSD: patch-puppetboard_app_py,v 1.3 2014/01/15 08:41:08 jasper Exp $
-
-- From d92a068057baa8cfc0e65a61b951fdc08d01eeaa Mon Sep 17 00:00:00 2001
-  From: Daniele Sluijters <daniele.sluijters@nedap.com>
-  Date: Mon, 13 Jan 2014 13:11:18 +0100
-  Subject: [PATCH] Switch to using pypuppetdb 0.1.0.
-
-- From 5fa260e748ca83649ea41e2e836ee84500dbfe77 Mon Sep 17 00:00:00 2001
-  From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-  Date: Mon, 23 Dec 2013 11:08:12 +0100
-  Subject: [PATCH] Report rounded avg. resources per node.
-
---- puppetboard/app.py.orig	Mon Dec 23 09:44:31 2013
-+++ puppetboard/app.py	Wed Jan 15 09:22:32 2014
-@@ -33,7 +33,7 @@ puppetdb = connect(
-     api_version=3,
-     host=app.config['PUPPETDB_HOST'],
-     port=app.config['PUPPETDB_PORT'],
--    ssl=app.config['PUPPETDB_SSL'],
-+    ssl_verify=app.config['PUPPETDB_SSL_VERIFY'],
-     ssl_key=app.config['PUPPETDB_KEY'],
-     ssl_cert=app.config['PUPPETDB_CERT'],
-     timeout=app.config['PUPPETDB_TIMEOUT'],)
-@@ -100,7 +100,7 @@ def index():
-     metrics = {
-         'num_nodes': num_nodes['Value'],
-         'num_resources': num_resources['Value'],
--        'avg_resources_node': "{0:10.6f}".format(avg_resources_node['Value']),
-+        'avg_resources_node': "{0:10.0f}".format(avg_resources_node['Value']),
-         }
- 
-     nodes = puppetdb.nodes(

www/puppetboard/patches/patch-puppetboard_default_settings_py

@@ -1,17 +0,0 @@
-$OpenBSD: patch-puppetboard_default_settings_py,v 1.1 2014/01/15 08:41:08 jasper Exp $
-
-From d92a068057baa8cfc0e65a61b951fdc08d01eeaa Mon Sep 17 00:00:00 2001
-From: Daniele Sluijters <daniele.sluijters@nedap.com>
-Date: Mon, 13 Jan 2014 13:11:18 +0100
-Subject: [PATCH] Switch to using pypuppetdb 0.1.0.
-
---- puppetboard/default_settings.py.orig	Wed Jan 15 09:22:42 2014
-+++ puppetboard/default_settings.py	Wed Jan 15 09:22:58 2014
-@@ -1,6 +1,6 @@
- PUPPETDB_HOST = 'localhost'
- PUPPETDB_PORT = 8080
--PUPPETDB_SSL = False
-+PUPPETDB_SSL_VERIFY = True
- PUPPETDB_KEY = None
- PUPPETDB_CERT = None
- PUPPETDB_TIMEOUT = 20

www/puppetboard/pkg/PLIST

@@ -1,13 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/12/27 11:06:33 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2014/01/22 09:21:17 jasper Exp $
 puppetboard/
-puppetboard/.gitignore
 puppetboard/CHANGELOG.rst
 puppetboard/LICENSE
+puppetboard/MANIFEST.in
+puppetboard/PKG-INFO
 puppetboard/README.rst
-puppetboard/dev.py
-puppetboard/passenger_wsgi.py
 puppetboard/puppetboard/
-puppetboard/puppetboard_wsgi.py
+puppetboard/puppetboard.egg-info/
+puppetboard/puppetboard.egg-info/PKG-INFO
+puppetboard/puppetboard.egg-info/SOURCES.txt
+puppetboard/puppetboard.egg-info/dependency_links.txt
+puppetboard/puppetboard.egg-info/requires.txt
+puppetboard/puppetboard.egg-info/top_level.txt
 puppetboard/puppetboard/__init__.py
 puppetboard/puppetboard/app.py
 puppetboard/puppetboard/default_settings.py.dist
@@ -15,9 +19,6 @@ puppetboard/puppetboard/default_settings.py.dist
 puppetboard/puppetboard/forms.py
 puppetboard/puppetboard/public/
 puppetboard/puppetboard/static/
-puppetboard/puppetboard/static/coffeescript/
-puppetboard/puppetboard/static/coffeescript/lists.coffee
-puppetboard/puppetboard/static/coffeescript/tables.coffee
 puppetboard/puppetboard/static/css/
 puppetboard/puppetboard/static/css/puppetboard.css
 puppetboard/puppetboard/static/js/
@@ -47,7 +48,10 @@ puppetboard/puppetboard/templates/reports.html
 puppetboard/puppetboard/templates/reports_node.html
 puppetboard/puppetboard/tmp/
 puppetboard/puppetboard/utils.py
+puppetboard/puppetboard_wsgi.py
 puppetboard/requirements.txt
+puppetboard/setup.cfg
+puppetboard/setup.py
 @rcscript ${RCDIR}/puppetboard
 @cwd ${LOCALBASE}/share/doc/pkg-readmes
 ${FULLPKGNAME}