cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove py3 flavor but make it default. For the rationale, see

Browse Source 
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)
This commit is contained in:
danj 2016-11-02 09:01:13 +00:00
parent abe5c9ddfa
commit 96ff6f8de7
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/puppetboard/Makefile
View File

@ -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

6
www/puppetboard/pkg/PLIST
View File

@ -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

4
www/puppetboard/pkg/puppetboard.rc
View File

@ -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