From owner-svn-ports-all@FreeBSD.ORG Sat Dec 21 21:50:03 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 686C0879; Sat, 21 Dec 2013 21:50:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4892714FC; Sat, 21 Dec 2013 21:50:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLLo3Uv024042; Sat, 21 Dec 2013 21:50:03 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLLo29F023984; Sat, 21 Dec 2013 21:50:02 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201312212150.rBLLo29F023984@svn.freebsd.org> From: Chris Rees Date: Sat, 21 Dec 2013 21:50:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337166 - head/sysutils/monitorix X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 21:50:03 -0000 Author: crees Date: Sat Dec 21 21:50:02 2013 New Revision: 337166 URL: http://svnweb.freebsd.org/changeset/ports/337166 Log: Update to 3.4.0 and stageify Modified: head/sysutils/monitorix/Makefile head/sysutils/monitorix/distinfo head/sysutils/monitorix/pkg-plist Modified: head/sysutils/monitorix/Makefile ============================================================================== --- head/sysutils/monitorix/Makefile Sat Dec 21 21:36:12 2013 (r337165) +++ head/sysutils/monitorix/Makefile Sat Dec 21 21:50:02 2013 (r337166) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= monitorix -PORTVERSION= 3.3.1 +PORTVERSION= 3.4.0 CATEGORIES= sysutils MASTER_SITES= http://www.monitorix.org/ \ http://www.monitorix.org/old_versions/ \ @@ -12,7 +12,7 @@ COMMENT= A web based monitoring system LICENSE= GPLv2 -LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool +LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool RUN_DEPENDS= p5-ParallelUA>=0:${PORTSDIR}/www/p5-ParallelUA \ p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ @@ -24,9 +24,6 @@ RUN_DEPENDS= p5-ParallelUA>=0:${PORTSDIR USES= perl5 USE_PERL5= run -MAN5= monitorix.conf.5 -MAN8= monitorix.8 -MANCOMPRESSED= no NO_BUILD= yes USE_RC_SUBR= ${PORTNAME} @@ -54,7 +51,6 @@ WWW_FILES= logo_top.png \ PORTDOCS= * PORTDATA= *.pm -NO_STAGE= yes .include pre-everything:: @@ -83,49 +79,30 @@ post-patch: ${WRKSRC}/monitorix.conf do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/monitorix ${PREFIX}/bin/ - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}/ - @${MKDIR} ${WWWDIR} - @${INSTALL} -d -o ${WWW_OWNER} -g ${WWW_GROUP} ${WWWDIR}/imgs -.for f in ${WWW_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${WWWDIR}/ + ${INSTALL_SCRIPT} ${WRKSRC}/monitorix ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}/ + ${MKDIR} ${STAGEDIR}${WWWDIR} + (cd ${STAGEDIR}${WWWDIR} && ${MKDIR} usage imgs) + ${INSTALL_DATA} ${WWW_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${WWWDIR}/ + ${MKDIR} ${STAGEDIR}${PREFIX}/${CGIDIR} + ${LN} -sf ${PREFIX}/${CGIDIR} ${STAGEDIR}${WWWDIR}/cgi + ${INSTALL_SCRIPT} ${WRKSRC}/monitorix.cgi \ + ${STAGEDIR}${PREFIX}/${CGIDIR}/ +.for s in 5 8 + ${INSTALL_MAN} ${WRKSRC}/man/man$s/* ${STAGEDIR}${PREFIX}/man/man$s/ .endfor - @${MKDIR} ${PREFIX}/${CGIDIR} - @${LN} -s ${PREFIX}/${CGIDIR} ${WWWDIR}/cgi - @${INSTALL_SCRIPT} ${WRKSRC}/monitorix.cgi ${PREFIX}/${CGIDIR}/ -.for c in 5 8 -. for m in ${MAN$c} - @${INSTALL_MAN} ${WRKSRC}/man/man$c/$m ${MAN$cPREFIX}/man/man$c/ -. endfor -.endfor - @${MKDIR} ${WWWDIR}/reports + ${MKDIR} ${STAGEDIR}${WWWDIR}/reports .for l in ${REPORT_LANG} - @${INSTALL_DATA} ${WRKSRC}/reports/${l}.html \ - ${WWWDIR}/reports/$l.html.sample + ${INSTALL_DATA} ${WRKSRC}/reports/${l}.html \ + ${STAGEDIR}${WWWDIR}/reports/$l.html.sample +.endfor + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in docs/*[^t] README README.FreeBSD README.nginx Changes + ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -. for f in docs/* README README.FreeBSD README.nginx Changes - @${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} -. endfor -.endif - -post-install: - @${MKDIR} ${DATADIR} - @${MKDIR} ${WWWDIR}/usage - @${INSTALL_DATA} ${WRKSRC}/monitorix.conf \ - ${PREFIX}/etc/monitorix.conf.sample - @if [ ! -f ${PREFIX}/etc/monitorix.conf ]; then \ - ${CP} -p ${PREFIX}/etc/monitorix.conf.sample \ - ${PREFIX}/etc/monitorix.conf ; \ - fi - if [ ! -d ${DBDIR} ]; then \ - ${INSTALL} -d -o ${WWW_OWNER} -g ${WWW_GROUP} ${DBDIR}; \ - if [ -f ${DATADIR}/fs.rrd ]; then \ - ${MV} ${DATADIR}/*.rrd ${DBDIR}; \ - fi; \ - fi - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/monitorix.conf \ + ${STAGEDIR}${PREFIX}/etc/monitorix.conf.sample + ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME} .include Modified: head/sysutils/monitorix/distinfo ============================================================================== --- head/sysutils/monitorix/distinfo Sat Dec 21 21:36:12 2013 (r337165) +++ head/sysutils/monitorix/distinfo Sat Dec 21 21:50:02 2013 (r337166) @@ -1,2 +1,2 @@ -SHA256 (monitorix-3.3.1.tar.gz) = b308cc300bba52ba2b8a8d6e613ddac042c9a27aa6f38dbf24c7e9358a70447d -SIZE (monitorix-3.3.1.tar.gz) = 186779 +SHA256 (monitorix-3.4.0.tar.gz) = 75c1ccf4922fced53fa5bdcd57a61f501a6b883ca9272b5a7e01caf4888a9b9c +SIZE (monitorix-3.4.0.tar.gz) = 201139 Modified: head/sysutils/monitorix/pkg-plist ============================================================================== --- head/sysutils/monitorix/pkg-plist Sat Dec 21 21:36:12 2013 (r337165) +++ head/sysutils/monitorix/pkg-plist Sat Dec 21 21:50:02 2013 (r337166) @@ -1,12 +1,13 @@ -@exec mkdir -p %D/%%WWWDIR%%/imgs -@exec chown %%WWW_OWNER%%:%%WWW_GROUP%% %D/%%WWWDIR%%/imgs +@exec install -d -o %%WWW_OWNER%% -g %%WWW_GROUP%% %D/%%WWWDIR%%/imgs @unexec if cmp -s %D/etc/monitorix.conf %D/etc/monitorix.conf.sample; then rm -f %D/etc/monitorix.conf; fi etc/monitorix.conf.sample -@exec if [ ! -f %D/etc/monitorix.conf ]; then cp %B/%f %D/etc/monitorix.conf; fi +@exec if [ ! -f %D/etc/monitorix.conf ]; then cp %D/%F %B/monitorix.conf; fi bin/monitorix @exec mkdir -p %D/%%WWWDIR%%/usage @dirrmtry %%WWWDIR%%/usage %%CGIDIR%%/monitorix.cgi +man/man5/monitorix.conf.5.gz +man/man8/monitorix.8.gz @unexec rm -f %B/monitorix.conf.path @dirrmtry %%CGIDIR%% %%WWWDIR%%/reports/ca.html.sample @@ -21,7 +22,6 @@ bin/monitorix %%WWWDIR%%/cgi @dirrmtry %%WWWDIR%%/imgs @dirrmtry %%WWWDIR%% - @comment rrd files are now kept in /var/db/monitorix, we'll move @comment previous files over for the user @exec [ -d %%DBDIR%% ] || install -d -o %%WWW_OWNER%% -g %%WWW_GROUP%% %%DBDIR%%