Date: Sat, 2 Nov 2013 17:06:48 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332505 - in head/net-mgmt/xymon-server: . files Message-ID: <201311021706.rA2H6mN1061810@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Sat Nov 2 17:06:48 2013 New Revision: 332505 URL: http://svnweb.freebsd.org/changeset/ports/332505 Log: Support STAGE Approved by: swills (mentor) Modified: head/net-mgmt/xymon-server/Makefile head/net-mgmt/xymon-server/files/xymon-server.in head/net-mgmt/xymon-server/pkg-plist Modified: head/net-mgmt/xymon-server/Makefile ============================================================================== --- head/net-mgmt/xymon-server/Makefile Sat Nov 2 16:57:12 2013 (r332504) +++ head/net-mgmt/xymon-server/Makefile Sat Nov 2 17:06:48 2013 (r332505) @@ -13,8 +13,8 @@ COMMENT= System for monitoring servers a LICENSE= GPLv2 BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ + libpcre.so:${PORTSDIR}/devel/pcre RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \ fping:${PORTSDIR}/net/fping \ mtr:${PORTSDIR}/net/mtr-nox11 @@ -27,17 +27,19 @@ XYMONUSER?= xymon XYMONHOSTNAME?= xymon.example.com XYMONHOSTIP?= 127.0.0.1 -USE_GMAKE= yes +USES= gmake USE_OPENSSL= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ENV= MAKE=gmake MAKE_ENV+= XYMONUSER="${XYMONUSER}" MAKE_ENV+= XYMONHOSTNAME="${XYMONHOSTNAME}" MAKE_ENV+= XYMONHOSTIP="${XYMONHOSTIP}" +MAKE_ENV+= INSTALLROOT="${STAGEDIR}" +MANPREFIX= ${STAGEDIR}${PREFIX} MAKE_ARGS+= PKGBUILD="true" USE_RC_SUBR= xymon-server SUB_LIST+= XYMONUSER="${XYMONUSER}" -PLIST_SUB+= XYMONUSER="${XYMONUSER}" VARBASE="/var" +PLIST_SUB+= XYMONUSER="${XYMONUSER}" CONFIG_FILES= alerts.cfg analysis.cfg cgioptions.cfg client-local.cfg \ columndoc.csv combo.cfg graphs.cfg holidays.cfg protocols.cfg \ @@ -46,29 +48,9 @@ FIXME1= alerts.cfg hosts.cfg xymon-apac FIXME2= analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \ snmpmibs.cfg xymonmenu.cfg xymonserver-migration.cfg -MAN1 = ackinfo.cgi.1 acknowledge.cgi.1 appfeed.cgi.1 clientupdate.1 \ - combostatus.1 confreport.cgi.1 criticaleditor.cgi.1 \ - criticalview.cgi.1 csvinfo.cgi.1 datepage.cgi.1 eventlog.cgi.1 \ - findhost.cgi.1 ghostlist.cgi.1 history.cgi.1 hostgraphs.cgi.1 \ - logfetch.1 orcaxymon.1 report.cgi.1 reportlog.cgi.1 showgraph.cgi.1 \ - snapshot.cgi.1 statusreport.cgi.1 svcstatus.cgi.1 xymon.1 xymoncfg.1 \ - xymoncmd.1 xymondigest.1 xymongen.1 xymongrep.1 xymonnet-again.sh.1 \ - xymonnet.1 xymonpage.cgi.1 xymonping.1 -MAN5= alerts.cfg.5 analysis.cfg.5 cgioptions.cfg.5 client-local.cfg.5 \ - clientlaunch.cfg.5 combo.cfg.5 critical.cfg.5 graphs.cfg.5 \ - hosts.cfg.5 protocols.cfg.5 tasks.cfg.5 xymon-xmh.5 \ - xymonclient.cfg.5 xymonserver.cfg.5 xymonweb.5 xymonwebaccess.5 -MAN7= xymon.7 -MAN8= enadis.cgi.8 xymon-mailack.8 xymoncgimsg.cgi.8 xymond.8 \ - xymond_alert.8 xymond_capture.8 xymond_channel.8 xymond_client.8 \ - xymond_distribute.8 xymond_filestore.8 xymond_history.8 \ - xymond_hostdata.8 xymond_rrd.8 xymond_sample.8 xymonfetch.8 \ - xymonlaunch.8 xymonproxy.8 msgcache.8 trimhistory.8 - OPTIONS_DEFINE=LDAP NETSNMP NETSNMP_DESC=Enable Net-SNMP support -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLDAP} @@ -78,7 +60,7 @@ USE_OPENLDAP= yes .if ${PORT_OPTIONS:MNETSNMP} MAKE_ENV+= WITH_NETSNMP=1 -LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp .endif post-patch: @@ -95,18 +77,23 @@ do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ post-install: - ${MKDIR} ${WWWDIR}/server/etc - ${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${WWWDIR}/server/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${WWWDIR}/server/bin/ + ${MKDIR} ${STAGEDIR}${WWWDIR}/server/etc + ${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${STAGEDIR}${WWWDIR}/server/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${STAGEDIR}${WWWDIR}/server/bin/ .for i in ${FIXME1} - ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i}.DIST ${WWWDIR}/server/etc/ + ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/ .endfor .for i in ${FIXME2} - ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${WWWDIR}/server/etc/${i}.DIST + ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${STAGEDIR}${WWWDIR}/server/etc/${i}.DIST .endfor .for i in ${CONFIG_FILES} - ${CP} -np ${WWWDIR}/server/etc/${i}.DIST \ - ${WWWDIR}/server/etc/${i} || ${TRUE} + ${CP} -np ${STAGEDIR}${WWWDIR}/server/etc/${i}.DIST \ + ${STAGEDIR}${WWWDIR}/server/etc/${i} || ${TRUE} .endfor + # this dir should NOT get installed with the package; will do in rc script + ${RMDIR} ${STAGEDIR}/var/log/xymon + ${RMDIR} ${STAGEDIR}/var/log + ${RMDIR} ${STAGEDIR}/var + .include <bsd.port.mk> Modified: head/net-mgmt/xymon-server/files/xymon-server.in ============================================================================== --- head/net-mgmt/xymon-server/files/xymon-server.in Sat Nov 2 16:57:12 2013 (r332504) +++ head/net-mgmt/xymon-server/files/xymon-server.in Sat Nov 2 17:06:48 2013 (r332505) @@ -5,22 +5,30 @@ # PROVIDE: xymon_server # REQUIRE: DAEMON +# KEYWORD: shutdown . /etc/rc.subr -name="xymon_server" -rcvar="xymon_server_enable" +name=xymon_server +rcvar=xymon_server_enable load_rc_config "$name" -: ${xymon_server_enable:="NO"} +: ${xymon_server_enable:=NO} command="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh'" +start_precmd=xymon_prestart start_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh start'" stop_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh stop'" status_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh status'" reload_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh reload'" restart_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh restart'" -pidfile="/var/log/xymon/xymond.pid" +pidfile=/var/log/xymon/xymond.pid + +xymon_prestart() +{ + if [ ! -d /var/log/xymon ]; then + install -d -o xymon /var/log/xymon + fi +} run_rc_command "$1" -# eof Modified: head/net-mgmt/xymon-server/pkg-plist ============================================================================== --- head/net-mgmt/xymon-server/pkg-plist Sat Nov 2 16:57:12 2013 (r332504) +++ head/net-mgmt/xymon-server/pkg-plist Sat Nov 2 17:06:48 2013 (r332505) @@ -1,3 +1,72 @@ +man/man1/ackinfo.cgi.1 +man/man1/acknowledge.cgi.1 +man/man1/appfeed.cgi.1 +man/man1/clientupdate.1 +man/man1/combostatus.1 +man/man1/confreport.cgi.1 +man/man1/criticaleditor.cgi.1 +man/man1/criticalview.cgi.1 +man/man1/csvinfo.cgi.1 +man/man1/datepage.cgi.1 +man/man1/eventlog.cgi.1 +man/man1/findhost.cgi.1 +man/man1/ghostlist.cgi.1 +man/man1/history.cgi.1 +man/man1/hostgraphs.cgi.1 +man/man1/logfetch.1 +man/man1/orcaxymon.1 +man/man1/report.cgi.1 +man/man1/reportlog.cgi.1 +man/man1/showgraph.cgi.1 +man/man1/snapshot.cgi.1 +man/man1/statusreport.cgi.1 +man/man1/svcstatus.cgi.1 +man/man1/xymon.1 +man/man1/xymoncfg.1 +man/man1/xymoncmd.1 +man/man1/xymondigest.1 +man/man1/xymongen.1 +man/man1/xymongrep.1 +man/man1/xymonnet-again.sh.1 +man/man1/xymonnet.1 +man/man1/xymonpage.cgi.1 +man/man1/xymonping.1 +man/man5/alerts.cfg.5 +man/man5/analysis.cfg.5 +man/man5/cgioptions.cfg.5 +man/man5/client-local.cfg.5 +man/man5/clientlaunch.cfg.5 +man/man5/combo.cfg.5 +man/man5/critical.cfg.5 +man/man5/graphs.cfg.5 +man/man5/hosts.cfg.5 +man/man5/protocols.cfg.5 +man/man5/tasks.cfg.5 +man/man5/xymon-xmh.5 +man/man5/xymonclient.cfg.5 +man/man5/xymonserver.cfg.5 +man/man5/xymonweb.5 +man/man5/xymonwebaccess.5 +man/man7/xymon.7 +man/man8/enadis.cgi.8 +man/man8/msgcache.8 +man/man8/trimhistory.8 +man/man8/xymon-mailack.8 +man/man8/xymoncgimsg.cgi.8 +man/man8/xymond.8 +man/man8/xymond_alert.8 +man/man8/xymond_capture.8 +man/man8/xymond_channel.8 +man/man8/xymond_client.8 +man/man8/xymond_distribute.8 +man/man8/xymond_filestore.8 +man/man8/xymond_history.8 +man/man8/xymond_hostdata.8 +man/man8/xymond_rrd.8 +man/man8/xymond_sample.8 +man/man8/xymonfetch.8 +man/man8/xymonlaunch.8 +man/man8/xymonproxy.8 %%WWWDIR%%/cgi-bin/appfeed-critical.sh %%WWWDIR%%/cgi-bin/appfeed.sh %%WWWDIR%%/cgi-bin/certreport.sh @@ -431,5 +500,3 @@ @dirrm %%WWWDIR%%/cgi-secure @dirrm %%WWWDIR%%/cgi-bin @dirrmtry %%WWWDIR%% -@exec install -d -o %%XYMONUSER%% -p %%VARBASE%%/log/xymon -@dirrmtry %%VARBASE%%/log/xymon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311021706.rA2H6mN1061810>