From 96ff6f8de74330498a22b8d8d0a190a3f8b52b57 Mon Sep 17 00:00:00 2001
From: danj <danj@openbsd.org>
Date: Wed, 2 Nov 2016 09:01:13 +0000
Subject: [PATCH] Remove py3 flavor but make it default. For the rationale, see
 https://marc.info/?l=openbsd-ports-cvs&m=147393010423200&w=2

While there, fix wrong substitution in the PLIST

test and OK sebastia@ (who noticed the rc script needed to be updated)
---
 www/puppetboard/Makefile           | 7 +++----
 www/puppetboard/pkg/PLIST          | 6 +++---
 www/puppetboard/pkg/puppetboard.rc | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/www/puppetboard/Makefile b/www/puppetboard/Makefile
index ea8e8560c0e..d1cc22ba5c6 100644
--- a/www/puppetboard/Makefile
+++ b/www/puppetboard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2016/09/06 12:08:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2016/11/02 09:01:13 danj Exp $
 
 COMMENT=		web interface to PuppetDB
 
 MODPY_EGG_VERSION=	0.2.0
 DISTNAME=		puppetboard-${MODPY_EGG_VERSION}
-REVISION=		0
+REVISION=		1
 CATEGORIES=		www
 
 MAINTAINER=		Sebastian Reitenbach <sebastia@openbsd.org>
@@ -15,8 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES=		lang/python
 MODPY_PI =		Yes
 
-FLAVORS =		python3
-FLAVOR ?=
+MODPY_VERSION=		${MODPY_DEFAULT_VERSION_3}
 
 NO_BUILD=		Yes
 NO_TEST=		Yes
diff --git a/www/puppetboard/pkg/PLIST b/www/puppetboard/pkg/PLIST
index 24c599f51d4..0e59f8a0ac2 100644
--- a/www/puppetboard/pkg/PLIST
+++ b/www/puppetboard/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2016/07/04 07:44:24 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.8 2016/11/02 09:01:13 danj Exp $
 @newuser _puppetboard:739:www:daemon:Puppetboard user:/nonexistent:/sbin/nologin
 puppetboard/
 puppetboard/CHANGELOG.rst
@@ -50,8 +50,8 @@ puppetboard/puppetboard/static/js/radiator.js
 puppetboard/puppetboard/static/js/scroll.top.js
 puppetboard/puppetboard/static/js/tables.js
 puppetboard/puppetboard/static/js/timestamps.js
-puppetboard/puppetboard/static/moment.js-${MODPY_VERSION}.0/
-puppetboard/puppetboard/static/moment.js-${MODPY_VERSION}.0/moment.min.js
+puppetboard/puppetboard/static/moment.js-2.7.0/
+puppetboard/puppetboard/static/moment.js-2.7.0/moment.min.js
 puppetboard/puppetboard/templates/
 puppetboard/puppetboard/templates/400.html
 puppetboard/puppetboard/templates/403.html
diff --git a/www/puppetboard/pkg/puppetboard.rc b/www/puppetboard/pkg/puppetboard.rc
index cdb3b4b4d32..79f90d24412 100644
--- a/www/puppetboard/pkg/puppetboard.rc
+++ b/www/puppetboard/pkg/puppetboard.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: puppetboard.rc,v 1.5 2015/08/01 06:13:25 ajacoutot Exp $
+# $OpenBSD: puppetboard.rc,v 1.6 2016/11/02 09:01:13 danj Exp $
 
 daemon="puppetboard_wsgi"
 daemon_flags="--workers 4"
@@ -12,7 +12,7 @@ pexp="${MODPY_BIN}.*${daemon_flags:+ ${daemon_flags}} ${daemon}:application"
 
 rc_start() {
 	${rcexec} "cd ${INSTDIR} && \
-		${LOCALBASE}/bin/gunicorn --daemon ${daemon_flags} ${daemon}:application"
+		${LOCALBASE}/bin/gunicorn${MODPY_BIN_SUFFIX} --daemon ${daemon_flags} ${daemon}:application"
 }
 
 rc_cmd $1