Wed Mar 9 12:09:29 2016 UTC ()
. Added rc.d script
. Handle needed directories
. Working-by-default configuration
. More path fixing in templates


(imil)
diff -r1.3 -r1.4 pkgsrc/sysutils/facette/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/facette/files/facette.sh
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/facette/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/facette/Attic/Makefile 2016/03/08 20:21:50 1.3
+++ pkgsrc/sysutils/facette/Attic/Makefile 2016/03/09 12:09:29 1.4
@@ -1,52 +1,104 @@ @@ -1,52 +1,104 @@
1# $NetBSD: Makefile,v 1.3 2016/03/08 20:21:50 imil Exp $ 1# $NetBSD: Makefile,v 1.4 2016/03/09 12:09:29 imil Exp $
2 2
3DISTNAME= facette-0.4.0dev 3DISTNAME= facette-0.4.0dev
4PKGREVISION= 2 4PKGREVISION= 4
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GITHUB:=facette/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=facette/}
7GITHUB_PROJECT= facette 7GITHUB_PROJECT= facette
8GITHUB_TAG= d77e77680d52d232305d0f12af6e3e1c857903cb 8GITHUB_TAG= d77e77680d52d232305d0f12af6e3e1c857903cb
9 9
10MAINTAINER= imil@NetBSD.org 10MAINTAINER= imil@NetBSD.org
11HOMEPAGE= https://facette.io/ 11HOMEPAGE= https://facette.io/
12COMMENT= Time series data visualization and graphing 12COMMENT= Time series data visualization and graphing
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15EXTRACT_USING= bsdtar 15EXTRACT_USING= bsdtar
16 16
17USE_TOOLS+= bsdtar gmake gsed pax pkg-config 17USE_TOOLS+= bsdtar gmake gsed pax pkg-config
18BUILD_DEPENDS+= go-[0-9]*:../../lang/go 18BUILD_DEPENDS+= go-[0-9]*:../../lang/go
19BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 19BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
20 20
21SUBST_CLASSES+= paths 21SUBST_CLASSES+= prefix
22SUBST_MESSAGE.paths= Fixing hardcoded paths. 22SUBST_MESSAGE.prefix= Fixing prefix.
23SUBST_STAGE.paths= pre-build 23SUBST_STAGE.prefix= pre-build
24SUBST_FILES.paths= Makefile 24SUBST_FILES.prefix= Makefile docs/examples/facette.json
25SUBST_SED.paths= -e 's,/usr/local,${PREFIX}/,g' 25SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g'
26 26
27DOCDIR= ${PREFIX}/share/doc/facette 27SUBST_CLASSES+= conf
 28SUBST_MESSAGE.conf= Fixing configuration path.
 29SUBST_STAGE.conf= pre-build
 30SUBST_FILES.conf= cmd/facette/facette.go \
 31 cmd/facettectl/facettectl.go \
 32 docs/examples/facette.json \
 33 docs/man/facette.1.md \
 34 docs/man/facettectl.8.md \
 35 pkg/config/config.go
 36SUBST_SED.conf= -e 's,/etc,${PKG_SYSCONFDIR},g'
 37
 38SUBST_CLASSES+= rrd
 39SUBST_MESSAGE.rrd= Fixing collectd rrd path.
 40SUBST_STAGE.rrd= pre-build
 41SUBST_FILES.rrd= docs/examples/providers/collectd.json
 42SUBST_SED.rrd= -e 's,/var/lib,${VARBASE}/db,g'
 43
 44FACETTE_USER?= facette
 45FACETTE_GROUP?= facette
 46
 47RCD_SCRIPTS+= facette
 48RCD_SCRIPT_SRC.facette= ${FILESDIR}/facette.sh
 49
 50FACETTE_DOCDIR= ${PREFIX}/share/doc/facette
 51FACETTE_HTDOCS= ${PREFIX}/share/facette
 52FACETTE_DATADIR= ${VARBASE}/lib/facette
 53FACETTE_LOGDIR= ${VARBASE}/log/facette
28EGDIR= ${PREFIX}/share/examples/facette 54EGDIR= ${PREFIX}/share/examples/facette
29DATADIR= ${PREFIX}/share/facette 55
30INSTALLATION_DIRS+= bin ${EGDIR} ${DOCDIR} 56INSTALLATION_DIRS+= bin ${EGDIR} ${FACETTE_DOCDIR}
31INSTALLATION_DIRS+= ${DATADIR}/template ${DATADIR}/static 57INSTALLATION_DIRS+= ${FACETTE_HTDOCS}/template ${FACETTE_HTDOCS}/static
 58
 59OWN_DIRS+= ${PKG_SYSCONFDIR}/facette
 60OWN_DIRS+= ${PKG_SYSCONFDIR}/facette/providers
 61OWN_DIRS+= ${VARBASE}/run/facette
 62OWN_DIRS+= ${FACETTE_DATADIR} ${FACETTE_LOGDIR}
 63
 64OWN_DIRS_PERMS+= ${VARBASE}/run/facette \
 65 ${FACETTE_USER} ${FACETTE_GROUP} 0755
 66OWN_DIRS_PERMS+= ${FACETTE_DATADIR} \
 67 ${FACETTE_USER} ${FACETTE_GROUP} 0755
 68OWN_DIRS_PERMS+= ${FACETTE_LOGDIR} \
 69 ${FACETTE_USER} ${FACETTE_GROUP} 0755
 70
 71PKG_GROUPS+= ${FACETTE_GROUP}
 72PKG_USERS+= ${FACETTE_USER}:${FACETTE_GROUP}
 73PKG_GECOS.${FACETTE_USER}= Facette daemon user
 74PKG_HOME.${FACETTE_USER}= ${FACETTE_DATADIR}
 75
 76FILES_SUBST+= FACETTE_USER=${FACETTE_USER}
 77FILES_SUBST+= FACETTE_GROUP=${FACETTE_GROUP}
 78FILES_SUBST+= FACETTE_LOGDIR=${FACETTE_LOGDIR}
 79
 80CONF_FILES+= ${EGDIR}/facette.json \
 81 ${PKG_SYSCONFDIR}/facette/facette.json
 82CONF_FILES+= ${EGDIR}/providers/collectd.json \
 83 ${PKG_SYSCONFDIR}/facette/providers/collectd.json
32 84
33CGO_LDFLAGS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG},${PREFIX}/lib 85CGO_LDFLAGS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG},${PREFIX}/lib
34 86
35do-build: 87do-build:
36 cd ${WRKSRC} && CGO_LDFLAGS="${CGO_LDFLAGS}" ${GMAKE} build 88 cd ${WRKSRC} && CGO_LDFLAGS="${CGO_LDFLAGS}" ${GMAKE} build
37 89
38do-install: 90do-install:
39 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facette \ 91 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facette \
40 ${DESTDIR}${PREFIX}/bin/ 92 ${DESTDIR}${PREFIX}/bin/
41 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facettectl \ 93 ${INSTALL_PROGRAM} ${WRKSRC}/build/*/bin/facettectl \
42 ${DESTDIR}${PREFIX}/bin/ 94 ${DESTDIR}${PREFIX}/bin/
43 cd ${WRKSRC}/docs/man && ${PAX} -rw * ${DESTDIR}${DOCDIR} 95 cd ${WRKSRC}/docs/man && ${PAX} -rw * ${DESTDIR}${FACETTE_DOCDIR}
44 cd ${WRKSRC}/docs/examples && ${PAX} -rw * ${DESTDIR}${EGDIR} 96 cd ${WRKSRC}/docs/examples && ${PAX} -rw * ${DESTDIR}${EGDIR}
45 cd ${WRKSRC}/build/*/template && \ 97 cd ${WRKSRC}/build/*/template && \
46 ${PAX} -rw * ${DESTDIR}${DATADIR}/template 98 ${PAX} -rw * ${DESTDIR}${FACETTE_HTDOCS}/template
47 cd ${WRKSRC}/build/*/static && \ 99 cd ${WRKSRC}/build/*/static && \
48 ${PAX} -rw * ${DESTDIR}${DATADIR}/static 100 ${PAX} -rw * ${DESTDIR}${FACETTE_HTDOCS}/static
49 101
50 102
51.include "../../databases/rrdtool/buildlink3.mk" 103.include "../../databases/rrdtool/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/sysutils/facette/files/Attic/facette.sh
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: facette.sh,v 1.1 2016/03/09 12:09:29 imil Exp $
#
# PROVIDE: facette 
# REQUIRE: DAEMON network
# KEYWORD: shutdown

if [ -f /etc/rc.subr ]; then
	. /etc/rc.subr
fi

name="facette"
rcvar=$name
command="@PREFIX@/bin/facette"
command_args="-l @FACETTE_LOGDIR@/${name}.log &"
facette_user="@FACETTE_USER@"

if [ -f /etc/rc.subr ]; then
        load_rc_config $name
	run_rc_command "$1"
else
	echo -n "${name}"
	@SU@ -m ${facette_user} -c "${command} ${command_args}"
fi