Attachment #171532 for bug #210368

View | Details | Raw Unified | Return to bug 210368
Collapse All | Expand All

Lines 25-31 Link Here

(-)net-mgmt/nfsen/Makefile (-3 / +8 lines)
25	USE_PHP= session pcre sockets	25	USE_PHP= session pcre sockets
26	NO_BUILD= yes	26	NO_BUILD= yes
27	NO_ARCH= yes	27	NO_ARCH= yes
		28	NFSENOWN?= www
28	PLIST_SUB+= PORTNAME=${PORTNAME}	29	PLIST_SUB+= PORTNAME=${PORTNAME}
		30	PLIST_SUB+= NFSENOWN=${NFSENOWN}
29	USE_RC_SUBR= nfsen	31	USE_RC_SUBR= nfsen
30	perl_OLD_CMD= %%PERL%%	32	perl_OLD_CMD= %%PERL%%
31	SHEBANG_FILES= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend libexec/NfSenRRD.pm \	33	SHEBANG_FILES= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend libexec/NfSenRRD.pm \
Lines 40-45 Link Here
40	SUB_LIST+= "PREFIX=${PREFIX}"	42	SUB_LIST+= "PREFIX=${PREFIX}"
41	SUB_LIST+= "WWWDIR=${WWWDIR}"	43	SUB_LIST+= "WWWDIR=${WWWDIR}"
42	SUB_LIST+= "PORTNAME=${PORTNAME}"	44	SUB_LIST+= "PORTNAME=${PORTNAME}"
		45	SUB_LIST+= "NFSENOWN=${NFSENOWN}"
43		46
44	post-patch:	47	post-patch:
45	.for nfsenfile in ${REINPLACE_LIST}	48	.for nfsenfile in ${REINPLACE_LIST}
Lines 52-57 Link Here
52	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/conf.php	55	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/conf.php
53	@${REINPLACE_CMD} "s\|/usr/bin/perl\|${perl_CMD}\|" ${WRKSRC}/libexec/Nfcomm.pm	56	@${REINPLACE_CMD} "s\|/usr/bin/perl\|${perl_CMD}\|" ${WRKSRC}/libexec/Nfcomm.pm
54		57
		58	FIND_EXPR= ! -name \._* -prune
		59
55	do-install:	60	do-install:
56	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-data/live	61	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-data/live
57	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-stat/live	62	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-stat/live
Lines 62-71 Link Here
62	${INSTALL} -d ${STAGEDIR}/${WWWDIR}/plugins	67	${INSTALL} -d ${STAGEDIR}/${WWWDIR}/plugins
63	(cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/bin/)	68	(cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/bin/)
64	${INSTALL_DATA} ${WRKSRC}/etc/nfsen-dist.conf ${STAGEDIR}/${PREFIX}/etc/	69	${INSTALL_DATA} ${WRKSRC}/etc/nfsen-dist.conf ${STAGEDIR}/${PREFIX}/etc/
65	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/)	70	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/ "${FIND_EXPR}")
66	(cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/)	71	(cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/ "${FIND_EXPR}")
67	(cd ${WRKSRC}/libexec && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/)	72	(cd ${WRKSRC}/libexec && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/)
68	(cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins/)	73	(cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins/ "${FIND_EXPR}")
69	${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/	74	${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/
70	${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/	75	${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/
71	${INSTALL_DATA} ${WRKSRC}/conf.php ${STAGEDIR}/${WWWDIR}	76	${INSTALL_DATA} ${WRKSRC}/conf.php ${STAGEDIR}/${WWWDIR}





nfsen_enable=${nfsen_enable-"NO"}
#nfsen_flags=${nfsen_flags-""}
nfsen_user=${nfsen_user-"%%NFSENOWN%%"}

command="%%PREFIX%%/bin/nfsen"
start_cmd="%%PREFIX%%/bin/nfsen start"

	if [ ! -e %%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat ]; then
		time=$(/bin/date +%s);
		timeu=$(/bin/expr $time - 300);
		profile_dat=%%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat
		/usr/bin/printf "name = live
		group = .
		tbegin = $time

		type = 0
		locked = 0
		status = OK
		version = 130" | /usr/bin/tr -d '\011' > ${profile_dat}
		chown ${nfsen_user} ${profile_dat}
	fi
}





%%WWWDIR%%/colour_picker.html
%%WWWDIR%%/colour_palette.html
%%WWWDIR%%/alerting.php
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/run
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-stat/live
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-stat
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-data/live
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-data
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles/live
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/filters
@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%
@dir var

Return to bug 210368

Lines 74-86 Link Here

(-)net-mgmt/nfsen/pkg-plist (-9 / +9 lines)
74	%%WWWDIR%%/colour_picker.html	74	%%WWWDIR%%/colour_picker.html
75	%%WWWDIR%%/colour_palette.html	75	%%WWWDIR%%/colour_palette.html
76	%%WWWDIR%%/alerting.php	76	%%WWWDIR%%/alerting.php
77	@dir var/%%PORTNAME%%/run	77	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/run
78	@dir var/%%PORTNAME%%/profiles-stat/live	78	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-stat/live
79	@dir var/%%PORTNAME%%/profiles-stat	79	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-stat
80	@dir var/%%PORTNAME%%/profiles-data/live	80	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-data/live
81	@dir var/%%PORTNAME%%/profiles-data	81	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles-data
82	@dir var/%%PORTNAME%%/profiles/live	82	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles/live
83	@dir var/%%PORTNAME%%/profiles	83	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/profiles
84	@dir var/%%PORTNAME%%/filters	84	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%/filters
85	@dir var/%%PORTNAME%%	85	@dir(%%NFSENOWN%%,,) var/%%PORTNAME%%
86	@dir var	86	@dir var

Lines 15-20 Link Here

(-)net-mgmt/nfsen/files/nfsen.in (-1 / +4 lines)
15		15
16	nfsen_enable=${nfsen_enable-"NO"}	16	nfsen_enable=${nfsen_enable-"NO"}
17	#nfsen_flags=${nfsen_flags-""}	17	#nfsen_flags=${nfsen_flags-""}
		18	nfsen_user=${nfsen_user-"%%NFSENOWN%%"}
18		19
19	command="%%PREFIX%%/bin/nfsen"	20	command="%%PREFIX%%/bin/nfsen"
20	start_cmd="%%PREFIX%%/bin/nfsen start"	21	start_cmd="%%PREFIX%%/bin/nfsen start"
Lines 34-39 Link Here
34	if [ ! -e %%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat ]; then	35	if [ ! -e %%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat ]; then
35	time=$(/bin/date +%s);	36	time=$(/bin/date +%s);
36	timeu=$(/bin/expr $time - 300);	37	timeu=$(/bin/expr $time - 300);
		38	profile_dat=%%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat
37	/usr/bin/printf "name = live	39	/usr/bin/printf "name = live
38	group = .	40	group = .
39	tbegin = $time	41	tbegin = $time
Lines 47-53 Link Here
47	type = 0	49	type = 0
48	locked = 0	50	locked = 0
49	status = OK	51	status = OK
50	version = 130" \| /usr/bin/tr -d '\011' > %%PREFIX%%/var/nfsen/profiles-stat/live/profile.dat;	52	version = 130" \| /usr/bin/tr -d '\011' > ${profile_dat}
		53	chown ${nfsen_user} ${profile_dat}
51	fi	54	fi
52	}	55	}
53		56