Fri Apr 22 14:52:18 2011 UTC ()
package update to 4.3.2:

+ fixes cross-site scripting vulnerabilities (SA44036)
+ contains a lot of filename cleanup work (no more bb and hobbit)

please read upgrade-to-430.txt when upgrading from a previous pkg
(see also the install message)


(spz)
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/DEINSTALL
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/INSTALL
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/distinfo
diff -r1.1 -r1.2 pkgsrc/net/xymon/MESSAGE
diff -r1.7 -r1.8 pkgsrc/net/xymon/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ab
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ad
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ae
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-af
diff -r0 -r1.1 pkgsrc/net/xymon/patches/patch-ah
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/DEINSTALL (expand / switch to unified diff)

--- pkgsrc/net/xymon/DEINSTALL 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/DEINSTALL 2011/04/22 14:52:18 1.2
@@ -1,158 +1,169 @@ @@ -1,158 +1,169 @@
1#! /bin/sh 1#! /bin/sh
2# 2#
3# $NetBSD: DEINSTALL,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 3# $NetBSD: DEINSTALL,v 1.2 2011/04/22 14:52:18 spz Exp $
4# 4#
5 5
6# xymons user/group 6# xymons user/group
7 7
8EXAMPLEDIR=@EXAMPLEDIR@ 8EXAMPLEDIR=@EXAMPLEDIR@
9BBHOME=@BBHOME@ 9XYMONHOME=@XYMONHOME@
10BBVAR=@BBVAR@ 10XYMONVAR=@XYMONVAR@
11BBLOGDIR=@BBLOGDIR@ 11XYMONLOGDIR=@XYMONLOGDIR@
12 12
13XYBINDIR=@XYBINDIR@ 13XYBINDIR=@XYBINDIR@
14XYETCDIR=@XYETCDIR@ 14XYETCDIR=@XYETCDIR@
15XYEXTDIR=@XYEXTDIR@ 15XYEXTDIR=@XYEXTDIR@
16XYTMPDIR=@XYTMPDIR@ 16XYTMPDIR=@XYTMPDIR@
17XYWEBDIR=@XYWEBDIR@ 17XYWEBDIR=@XYWEBDIR@
18XYWWWDIR=@XYWWWDIR@ 18XYWWWDIR=@XYWWWDIR@
19 19
20case ${STAGE} in 20case ${STAGE} in
21DEINSTALL) 21DEINSTALL)
22 22
23 GIFS="README arrow.gif bkg-blue.gif bkg-clear.gif \ 23 GIFS="README arrow.gif bkg-blue.gif bkg-clear.gif \
24 bkg-green.gif bkg-purple.gif bkg-red.gif bkg-yellow.gif \ 24 bkg-green.gif bkg-purple.gif bkg-red.gif bkg-yellow.gif \
25 blue-ack.gif blue-recent.gif blue.gif clear-recent.gif \ 25 blue-ack.gif blue-recent.gif blue.gif clear-recent.gif \
26 clear.gif favicon-blue.ico favicon-clear.ico \ 26 clear.gif favicon-blue.ico favicon-clear.ico \
27 favicon-green.ico favicon-purple.ico favicon-red.ico \ 27 favicon-green.ico favicon-purple.ico favicon-red.ico \
28 favicon-unknown.ico favicon-yellow.ico green-recent.gif \ 28 favicon-unknown.ico favicon-yellow.ico green-recent.gif \
29 green.gif purple-ack.gif purple-recent.gif purple.gif \ 29 green.gif purple-ack.gif purple-recent.gif purple.gif \
30 red-ack.gif red-recent.gif red.gif unknown-recent.gif \ 30 red-ack.gif red-recent.gif red.gif unknown-recent.gif \
31 unknown.gif yellow-ack.gif yellow-recent.gif \ 31 unknown.gif xymonbody.css yellow-ack.gif \
32 yellow.gif zoom.gif" 32 yellow-recent.gif yellow.gif zoom.gif"
33 for file in ${GIFS}; do 33 for file in ${GIFS}; do
34 ${RM} ${XYWWWDIR}/gifs/${file} 34 ${RM} ${XYWWWDIR}/gifs/${file}
35 done 35 done
36 36
37 MENUFILES="README menu.css menu.js menu_items.js menu_tpl.js" 37 MENUFILES="b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif \
 38 xymonmenu-blue.css xymonmenu-grey.css"
38 for file in ${MENUFILES}; do 39 for file in ${MENUFILES}; do
39 ${RM} ${XYWWWDIR}/menu/${file} 40 ${RM} ${XYWWWDIR}/menu/${file}
40 done 41 done
41 42
42 DOCFILES="about.html bb-to-hobbit.html clonewarn.jpg \ 43 DOCFILES="Renaming-430.txt about.html bb-to-xymon.html \
43 configure.txt criticalsystems.html \ 44 clonewarn.jpg configure.txt \
44 critview-detail-acked.jpg \ 45 criticalsystems.html critview-detail-acked.jpg \
45 critview-detail-ackform.jpg \ 46 critview-detail-ackform.jpg \
46 critview-detail.jpg critview-disk.jpg \ 47 critview-detail.jpg critview-disk.jpg \
47 critview-green.jpg editor-clonemaster.jpg \ 48 critview-green.jpg editor-clonemaster.jpg \
48 editor-diskchanged.jpg editor-disksetup.jpg \ 49 editor-diskchanged.jpg editor-disksetup.jpg \
49 editor-main.jpg editor-makeclone.jpg \ 50 editor-main.jpg editor-makeclone.jpg \
50 editor-nohost.jpg editor-showclone.jpg \ 51 editor-nohost.jpg editor-showclone.jpg \
51 hobbit-alerts.html hobbit-apacheconf.txt \ 
52 hobbit-bbhosts.png hobbit-clients.png \ 
53 hobbit-config.html hobbit-mrtg.html \ 
54 hobbit-tips.html hobbitmain.png hobbitprocs.png \ 
55 howtograph.html install.html known-issues.html \ 52 howtograph.html install.html known-issues.html \
56 mainview-acked.jpg mainview.jpg \ 53 mainview-acked.jpg mainview.jpg \
57 manpages/index.html \ 54 manpages/index.html \
58 manpages/man1/bb-ack.cgi.1.html \ 55 manpages/man1/ackinfo.cgi.1.html \
59 manpages/man1/bb-csvinfo.cgi.1.html \ 56 manpages/man1/acknowledge.cgi.1.html \
60 manpages/man1/bb-datepage.cgi.1.html \ 
61 manpages/man1/bb-eventlog.cgi.1.html \ 
62 manpages/man1/bb-findhost.cgi.1.html \ 
63 manpages/man1/bb-hist.cgi.1.html \ 
64 manpages/man1/bb-rep.cgi.1.html \ 
65 manpages/man1/bb-replog.cgi.1.html \ 
66 manpages/man1/bb-snapshot.cgi.1.html \ 
67 manpages/man1/bb-webpage.cgi.1.html \ 
68 manpages/man1/bb.1.html \ 
69 manpages/man1/bbcmd.1.html \ 
70 manpages/man1/bbcombotest.1.html \ 
71 manpages/man1/bbdigest.1.html \ 
72 manpages/man1/bbgen.1.html \ 
73 manpages/man1/bbhostgrep.1.html \ 
74 manpages/man1/bbhostshow.1.html \ 
75 manpages/man1/bbretest-net.sh.1.html \ 
76 manpages/man1/bbtest-net.1.html \ 
77 manpages/man1/clientupdate.1.html \ 57 manpages/man1/clientupdate.1.html \
78 manpages/man1/hobbit-ackinfo.cgi.1.html \ 58 manpages/man1/combostatus.1.html \
79 manpages/man1/hobbit-confreport.cgi.1.html \ 59 manpages/man1/confreport.cgi.1.html \
80 manpages/man1/hobbit-ghosts.cgi.1.html \ 60 manpages/man1/criticaleditor.cgi.1.html \
81 manpages/man1/hobbit-hostgraphs.cgi.1.html \ 61 manpages/man1/criticalview.cgi.1.html \
82 manpages/man1/hobbit-nkedit.cgi.1.html \ 62 manpages/man1/csvinfo.cgi.1.html \
83 manpages/man1/hobbit-nkview.cgi.1.html \ 63 manpages/man1/datepage.cgi.1.html \
84 manpages/man1/hobbit-statusreport.cgi.1.html \ 64 manpages/man1/eventlog.cgi.1.html \
85 manpages/man1/hobbitgraph.cgi.1.html \ 65 manpages/man1/findhost.cgi.1.html \
86 manpages/man1/hobbitping.1.html \ 66 manpages/man1/ghostlist.cgi.1.html \
87 manpages/man1/hobbitsvc.cgi.1.html \ 67 manpages/man1/history.cgi.1.html \
 68 manpages/man1/hostgraphs.cgi.1.html \
88 manpages/man1/logfetch.1.html \ 69 manpages/man1/logfetch.1.html \
89 manpages/man1/orcahobbit.1.html \ 70 manpages/man1/orcaxymon.1.html \
90 manpages/man5/bb-hosts.5.html \ 71 manpages/man1/report.cgi.1.html \
91 manpages/man5/bb-services.5.html \ 72 manpages/man1/reportlog.cgi.1.html \
92 manpages/man5/bbcombotest.cfg.5.html \ 73 manpages/man1/showgraph.cgi.1.html \
 74 manpages/man1/snapshot.cgi.1.html \
 75 manpages/man1/statusreport.cgi.1.html \
 76 manpages/man1/svcstatus.cgi.1.html \
 77 manpages/man1/xymon.1.html \
 78 manpages/man1/xymoncfg.1.html \
 79 manpages/man1/xymoncmd.1.html \
 80 manpages/man1/xymondigest.1.html \
 81 manpages/man1/xymongen.1.html \
 82 manpages/man1/xymongrep.1.html \
 83 manpages/man1/xymonnet-again.sh.1.html \
 84 manpages/man1/xymonnet.1.html \
 85 manpages/man1/xymonpage.cgi.1.html \
 86 manpages/man1/xymonping.1.html \
 87 manpages/man5/alerts.cfg.5.html \
 88 manpages/man5/analysis.cfg.5.html \
 89 manpages/man5/cgioptions.cfg.5.html \
93 manpages/man5/client-local.cfg.5.html \ 90 manpages/man5/client-local.cfg.5.html \
94 manpages/man5/clientlaunch.cfg.5.html \ 91 manpages/man5/clientlaunch.cfg.5.html \
95 manpages/man5/hobbit-alerts.cfg.5.html \ 92 manpages/man5/combo.cfg.5.html \
96 manpages/man5/hobbit-clients.cfg.5.html \ 93 manpages/man5/critical.cfg.5.html \
97 manpages/man5/hobbit-nkview.cfg.5.html \ 94 manpages/man5/graphs.cfg.5.html \
98 manpages/man5/hobbitcgi.cfg.5.html \ 95 manpages/man5/hosts.cfg.5.html \
99 manpages/man5/hobbitclient.cfg.5.html \ 96 manpages/man5/protocols.cfg.5.html \
100 manpages/man5/hobbitgraph.cfg.5.html \ 97 manpages/man5/tasks.cfg.5.html \
101 manpages/man5/hobbitlaunch.cfg.5.html \ 98 manpages/man5/xymon-xmh.5.html \
102 manpages/man5/hobbitserver.cfg.5.html \ 99 manpages/man5/xymonclient.cfg.5.html \
103 manpages/man5/hobbitweb.5.html \ 100 manpages/man5/xymonserver.cfg.5.html \
 101 manpages/man5/xymonweb.5.html \
104 manpages/man7/xymon.7.html \ 102 manpages/man7/xymon.7.html \
105 manpages/man8/bbmessage.cgi.8.html \ 103 manpages/man8/enadis.cgi.8.html \
106 manpages/man8/bbproxy.8.html \ 
107 manpages/man8/hobbit-enadis.cgi.8.html \ 
108 manpages/man8/hobbit-mailack.8.html \ 
109 manpages/man8/hobbitd.8.html \ 
110 manpages/man8/hobbitd_alert.8.html \ 
111 manpages/man8/hobbitd_channel.8.html \ 
112 manpages/man8/hobbitd_client.8.html \ 
113 manpages/man8/hobbitd_filestore.8.html \ 
114 manpages/man8/hobbitd_history.8.html \ 
115 manpages/man8/hobbitd_hostdata.8.html \ 
116 manpages/man8/hobbitd_rrd.8.html \ 
117 manpages/man8/hobbitd_sample.8.html \ 
118 manpages/man8/hobbitfetch.8.html \ 
119 manpages/man8/hobbitlaunch.8.html \ 
120 manpages/man8/msgcache.8.html \ 104 manpages/man8/msgcache.8.html \
121 manpages/man8/trimhistory.8.html \ 105 manpages/man8/trimhistory.8.html \
122 stdview-detail-acked.jpg" 106 manpages/man8/xymon-mailack.8.html \
 107 manpages/man8/xymoncgimsg.cgi.8.html \
 108 manpages/man8/xymond.8.html \
 109 manpages/man8/xymond_alert.8.html \
 110 manpages/man8/xymond_capture.8.html \
 111 manpages/man8/xymond_channel.8.html \
 112 manpages/man8/xymond_client.8.html \
 113 manpages/man8/xymond_filestore.8.html \
 114 manpages/man8/xymond_history.8.html \
 115 manpages/man8/xymond_hostdata.8.html \
 116 manpages/man8/xymond_rrd.8.html \
 117 manpages/man8/xymond_sample.8.html \
 118 manpages/man8/xymonfetch.8.html \
 119 manpages/man8/xymonlaunch.8.html \
 120 manpages/man8/xymonproxy.8.html \
 121 stdview-detail-acked.jpg \
 122 upgrade-to-430.txt \
 123 xymon-alerts.html \
 124 xymon-apacheconf.txt \
 125 xymon-clients.png \
 126 xymon-config.html \
 127 xymon-hosts.png \
 128 xymon-mrtg.html \
 129 xymon-tips.html \
 130 xymonmain.png \
 131 xymonprocs.png \
 132 "
123 DOCDIRS="manpages/man8 manpages/man7 manpages/man5 \ 133 DOCDIRS="manpages/man8 manpages/man7 manpages/man5 \
124 manpages/man1 manpages" 134 manpages/man1 manpages"
125 for file in ${DOCFILES}; do 135 for file in ${DOCFILES}; do
126 ${RM} ${XYWWWDIR}/help/${file} 136 ${RM} ${XYWWWDIR}/help/${file}
127 done 137 done
128 for dir in ${DOCDIRS}; do 138 for dir in ${DOCDIRS}; do
129 ${RMDIR} ${XYWWWDIR}/help/${dir} 139 ${RMDIR} ${XYWWWDIR}/help/${dir}
130 done 140 done
131 141
132 if [ -h ${BBHOME}/bin ]; then 142 if [ -h ${XYMONHOME}/bin ]; then
133 ${RM} ${BBHOME}/bin 143 ${RM} ${XYMONHOME}/bin
134 fi 144 fi
135 if [ -h ${BBHOME}/etc ]; then 145 if [ -h ${XYMONHOME}/etc ]; then
136 ${RM} ${BBHOME}/etc 146 ${RM} ${XYMONHOME}/etc
137 fi 147 fi
138 if [ -h ${BBHOME}/ext ]; then 148 if [ -h ${XYMONHOME}/ext ]; then
139 ${RM} ${BBHOME}/ext 149 ${RM} ${XYMONHOME}/ext
140 fi 150 fi
141 if [ -h ${BBHOME}/tmp ]; then 151 if [ -h ${XYMONHOME}/tmp ]; then
142 ${RM} ${BBHOME}/tmp 152 ${RM} ${XYMONHOME}/tmp
143 fi 153 fi
144 if [ -h ${BBHOME}/web ]; then 154 if [ -h ${XYMONHOME}/web ]; then
145 ${RM} ${BBHOME}/web 155 ${RM} ${XYMONHOME}/web
146 fi 156 fi
147 if [ -h ${BBHOME}/www ]; then 157 if [ -h ${XYMONHOME}/www ]; then
148 ${RM} ${BBHOME}/www 158 ${RM} ${XYMONHOME}/www
149 fi 159 fi
150 if [ -h ${BBHOME}/download ]; then 160 if [ -h ${XYMONHOME}/download ]; then
151 ${RM} ${BBHOME}/download 161 ${RM} ${XYMONHOME}/download
152 fi 162 fi
153 if [ -h ${BBHOME}/logs ]; then 163 if [ -h ${XYMONHOME}/logs ]; then
154 ${RM} ${BBHOME}/logs 164 ${RM} ${XYMONHOME}/logs
155 fi 165 fi
156 166
157 ;; 167 ;;
158esac 168esac
 169
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/INSTALL (expand / switch to unified diff)

--- pkgsrc/net/xymon/INSTALL 2010/02/14 22:58:57 1.1.1.1
+++ pkgsrc/net/xymon/INSTALL 2011/04/22 14:52:18 1.2
@@ -1,165 +1,175 @@ @@ -1,165 +1,175 @@
1#! /bin/sh 1#! /bin/sh
2# 2#
3# $NetBSD: INSTALL,v 1.1.1.1 2010/02/14 22:58:57 spz Exp $ 3# $NetBSD: INSTALL,v 1.2 2011/04/22 14:52:18 spz Exp $
4# 4#
5 5
6# xymons user/group 6# xymons user/group
7 7
8BBUSER=xymon 8XYMONUSER=xymon
9BBGROUP=xymon 9XYMONGROUP=xymon
10 10
11EXAMPLEDIR=@EXAMPLEDIR@ 11EXAMPLEDIR=@EXAMPLEDIR@
12BBHOME=@BBHOME@ 12XYMONHOME=@XYMONHOME@
13BBVAR=@BBVAR@ 13XYMONVAR=@XYMONVAR@
14BBLOGDIR=@BBLOGDIR@ 14XYMONLOGDIR=@XYMONLOGDIR@
15 15
16XYBINDIR=@XYBINDIR@ 16XYBINDIR=@XYBINDIR@
17XYETCDIR=@XYETCDIR@ 17XYETCDIR=@XYETCDIR@
18XYEXTDIR=@XYEXTDIR@ 18XYEXTDIR=@XYEXTDIR@
19XYTMPDIR=@XYTMPDIR@ 19XYTMPDIR=@XYTMPDIR@
20XYWEBDIR=@XYWEBDIR@ 20XYWEBDIR=@XYWEBDIR@
21XYWWWDIR=@XYWWWDIR@ 21XYWWWDIR=@XYWWWDIR@
22 22
23case ${STAGE} in 23case ${STAGE} in
24POST-INSTALL) 24POST-INSTALL)
25 25
26 GIFS="README arrow.gif bkg-blue.gif bkg-clear.gif \ 26 GIFS="README arrow.gif bkg-blue.gif bkg-clear.gif \
27 bkg-green.gif bkg-purple.gif bkg-red.gif bkg-yellow.gif \ 27 bkg-green.gif bkg-purple.gif bkg-red.gif bkg-yellow.gif \
28 blue-ack.gif blue-recent.gif blue.gif clear-recent.gif \ 28 blue-ack.gif blue-recent.gif blue.gif clear-recent.gif \
29 clear.gif favicon-blue.ico favicon-clear.ico \ 29 clear.gif favicon-blue.ico favicon-clear.ico \
30 favicon-green.ico favicon-purple.ico favicon-red.ico \ 30 favicon-green.ico favicon-purple.ico favicon-red.ico \
31 favicon-unknown.ico favicon-yellow.ico green-recent.gif \ 31 favicon-unknown.ico favicon-yellow.ico green-recent.gif \
32 green.gif purple-ack.gif purple-recent.gif purple.gif \ 32 green.gif purple-ack.gif purple-recent.gif purple.gif \
33 red-ack.gif red-recent.gif red.gif unknown-recent.gif \ 33 red-ack.gif red-recent.gif red.gif unknown-recent.gif \
34 unknown.gif yellow-ack.gif yellow-recent.gif \ 34 unknown.gif xymonbody.css yellow-ack.gif \
35 yellow.gif zoom.gif" 35 yellow-recent.gif yellow.gif zoom.gif"
36 for file in ${GIFS}; do 36 for file in ${GIFS}; do
37 ${CP} ${EXAMPLEDIR}/www/gifs/${file} ${XYWWWDIR}/gifs/${file} 37 ${CP} ${EXAMPLEDIR}/www/gifs/${file} ${XYWWWDIR}/gifs/${file}
38 ${CHMOD} 0444 ${XYWWWDIR}/gifs/${file} 38 ${CHMOD} 0444 ${XYWWWDIR}/gifs/${file}
39 done 39 done
40 40
41 MENUFILES="README menu.css menu.js menu_items.js menu_tpl.js" 41 MENUFILES="b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif \
 42 xymonmenu-blue.css xymonmenu-grey.css"
42 for file in ${MENUFILES}; do 43 for file in ${MENUFILES}; do
43 ${CP} ${EXAMPLEDIR}/www/menu/${file} ${XYWWWDIR}/menu/${file} 44 ${CP} ${EXAMPLEDIR}/www/menu/${file} ${XYWWWDIR}/menu/${file}
44 ${CHMOD} 0444 ${XYWWWDIR}/menu/${file} 45 ${CHMOD} 0444 ${XYWWWDIR}/menu/${file}
45 done 46 done
46 47
47 DOCFILES="about.html bb-to-hobbit.html clonewarn.jpg \ 48 DOCFILES="Renaming-430.txt about.html bb-to-xymon.html \
48 configure.txt criticalsystems.html \ 49 clonewarn.jpg configure.txt \
49 critview-detail-acked.jpg \ 50 criticalsystems.html critview-detail-acked.jpg \
50 critview-detail-ackform.jpg \ 51 critview-detail-ackform.jpg \
51 critview-detail.jpg critview-disk.jpg \ 52 critview-detail.jpg critview-disk.jpg \
52 critview-green.jpg editor-clonemaster.jpg \ 53 critview-green.jpg editor-clonemaster.jpg \
53 editor-diskchanged.jpg editor-disksetup.jpg \ 54 editor-diskchanged.jpg editor-disksetup.jpg \
54 editor-main.jpg editor-makeclone.jpg \ 55 editor-main.jpg editor-makeclone.jpg \
55 editor-nohost.jpg editor-showclone.jpg \ 56 editor-nohost.jpg editor-showclone.jpg \
56 hobbit-alerts.html hobbit-apacheconf.txt \ 
57 hobbit-bbhosts.png hobbit-clients.png \ 
58 hobbit-config.html hobbit-mrtg.html \ 
59 hobbit-tips.html hobbitmain.png hobbitprocs.png \ 
60 howtograph.html install.html known-issues.html \ 57 howtograph.html install.html known-issues.html \
61 mainview-acked.jpg mainview.jpg \ 58 mainview-acked.jpg mainview.jpg \
62 manpages/index.html \ 59 manpages/index.html \
63 manpages/man1/bb-ack.cgi.1.html \ 60 manpages/man1/ackinfo.cgi.1.html \
64 manpages/man1/bb-csvinfo.cgi.1.html \ 61 manpages/man1/acknowledge.cgi.1.html \
65 manpages/man1/bb-datepage.cgi.1.html \ 
66 manpages/man1/bb-eventlog.cgi.1.html \ 
67 manpages/man1/bb-findhost.cgi.1.html \ 
68 manpages/man1/bb-hist.cgi.1.html \ 
69 manpages/man1/bb-rep.cgi.1.html \ 
70 manpages/man1/bb-replog.cgi.1.html \ 
71 manpages/man1/bb-snapshot.cgi.1.html \ 
72 manpages/man1/bb-webpage.cgi.1.html \ 
73 manpages/man1/bb.1.html \ 
74 manpages/man1/bbcmd.1.html \ 
75 manpages/man1/bbcombotest.1.html \ 
76 manpages/man1/bbdigest.1.html \ 
77 manpages/man1/bbgen.1.html \ 
78 manpages/man1/bbhostgrep.1.html \ 
79 manpages/man1/bbhostshow.1.html \ 
80 manpages/man1/bbretest-net.sh.1.html \ 
81 manpages/man1/bbtest-net.1.html \ 
82 manpages/man1/clientupdate.1.html \ 62 manpages/man1/clientupdate.1.html \
83 manpages/man1/hobbit-ackinfo.cgi.1.html \ 63 manpages/man1/combostatus.1.html \
84 manpages/man1/hobbit-confreport.cgi.1.html \ 64 manpages/man1/confreport.cgi.1.html \
85 manpages/man1/hobbit-ghosts.cgi.1.html \ 65 manpages/man1/criticaleditor.cgi.1.html \
86 manpages/man1/hobbit-hostgraphs.cgi.1.html \ 66 manpages/man1/criticalview.cgi.1.html \
87 manpages/man1/hobbit-nkedit.cgi.1.html \ 67 manpages/man1/csvinfo.cgi.1.html \
88 manpages/man1/hobbit-nkview.cgi.1.html \ 68 manpages/man1/datepage.cgi.1.html \
89 manpages/man1/hobbit-statusreport.cgi.1.html \ 69 manpages/man1/eventlog.cgi.1.html \
90 manpages/man1/hobbitgraph.cgi.1.html \ 70 manpages/man1/findhost.cgi.1.html \
91 manpages/man1/hobbitping.1.html \ 71 manpages/man1/ghostlist.cgi.1.html \
92 manpages/man1/hobbitsvc.cgi.1.html \ 72 manpages/man1/history.cgi.1.html \
 73 manpages/man1/hostgraphs.cgi.1.html \
93 manpages/man1/logfetch.1.html \ 74 manpages/man1/logfetch.1.html \
94 manpages/man1/orcahobbit.1.html \ 75 manpages/man1/orcaxymon.1.html \
95 manpages/man5/bb-hosts.5.html \ 76 manpages/man1/report.cgi.1.html \
96 manpages/man5/bb-services.5.html \ 77 manpages/man1/reportlog.cgi.1.html \
97 manpages/man5/bbcombotest.cfg.5.html \ 78 manpages/man1/showgraph.cgi.1.html \
 79 manpages/man1/snapshot.cgi.1.html \
 80 manpages/man1/statusreport.cgi.1.html \
 81 manpages/man1/svcstatus.cgi.1.html \
 82 manpages/man1/xymon.1.html \
 83 manpages/man1/xymoncfg.1.html \
 84 manpages/man1/xymoncmd.1.html \
 85 manpages/man1/xymondigest.1.html \
 86 manpages/man1/xymongen.1.html \
 87 manpages/man1/xymongrep.1.html \
 88 manpages/man1/xymonnet-again.sh.1.html \
 89 manpages/man1/xymonnet.1.html \
 90 manpages/man1/xymonpage.cgi.1.html \
 91 manpages/man1/xymonping.1.html \
 92 manpages/man5/alerts.cfg.5.html \
 93 manpages/man5/analysis.cfg.5.html \
 94 manpages/man5/cgioptions.cfg.5.html \
98 manpages/man5/client-local.cfg.5.html \ 95 manpages/man5/client-local.cfg.5.html \
99 manpages/man5/clientlaunch.cfg.5.html \ 96 manpages/man5/clientlaunch.cfg.5.html \
100 manpages/man5/hobbit-alerts.cfg.5.html \ 97 manpages/man5/combo.cfg.5.html \
101 manpages/man5/hobbit-clients.cfg.5.html \ 98 manpages/man5/critical.cfg.5.html \
102 manpages/man5/hobbit-nkview.cfg.5.html \ 99 manpages/man5/graphs.cfg.5.html \
103 manpages/man5/hobbitcgi.cfg.5.html \ 100 manpages/man5/hosts.cfg.5.html \
104 manpages/man5/hobbitclient.cfg.5.html \ 101 manpages/man5/protocols.cfg.5.html \
105 manpages/man5/hobbitgraph.cfg.5.html \ 102 manpages/man5/tasks.cfg.5.html \
106 manpages/man5/hobbitlaunch.cfg.5.html \ 103 manpages/man5/xymon-xmh.5.html \
107 manpages/man5/hobbitserver.cfg.5.html \ 104 manpages/man5/xymonclient.cfg.5.html \
108 manpages/man5/hobbitweb.5.html \ 105 manpages/man5/xymonserver.cfg.5.html \
 106 manpages/man5/xymonweb.5.html \
109 manpages/man7/xymon.7.html \ 107 manpages/man7/xymon.7.html \
110 manpages/man8/bbmessage.cgi.8.html \ 108 manpages/man8/enadis.cgi.8.html \
111 manpages/man8/bbproxy.8.html \ 
112 manpages/man8/hobbit-enadis.cgi.8.html \ 
113 manpages/man8/hobbit-mailack.8.html \ 
114 manpages/man8/hobbitd.8.html \ 
115 manpages/man8/hobbitd_alert.8.html \ 
116 manpages/man8/hobbitd_channel.8.html \ 
117 manpages/man8/hobbitd_client.8.html \ 
118 manpages/man8/hobbitd_filestore.8.html \ 
119 manpages/man8/hobbitd_history.8.html \ 
120 manpages/man8/hobbitd_hostdata.8.html \ 
121 manpages/man8/hobbitd_rrd.8.html \ 
122 manpages/man8/hobbitd_sample.8.html \ 
123 manpages/man8/hobbitfetch.8.html \ 
124 manpages/man8/hobbitlaunch.8.html \ 
125 manpages/man8/msgcache.8.html \ 109 manpages/man8/msgcache.8.html \
126 manpages/man8/trimhistory.8.html \ 110 manpages/man8/trimhistory.8.html \
127 stdview-detail-acked.jpg" 111 manpages/man8/xymon-mailack.8.html \
 112 manpages/man8/xymoncgimsg.cgi.8.html \
 113 manpages/man8/xymond.8.html \
 114 manpages/man8/xymond_alert.8.html \
 115 manpages/man8/xymond_capture.8.html \
 116 manpages/man8/xymond_channel.8.html \
 117 manpages/man8/xymond_client.8.html \
 118 manpages/man8/xymond_filestore.8.html \
 119 manpages/man8/xymond_history.8.html \
 120 manpages/man8/xymond_hostdata.8.html \
 121 manpages/man8/xymond_rrd.8.html \
 122 manpages/man8/xymond_sample.8.html \
 123 manpages/man8/xymonfetch.8.html \
 124 manpages/man8/xymonlaunch.8.html \
 125 manpages/man8/xymonproxy.8.html \
 126 stdview-detail-acked.jpg \
 127 upgrade-to-430.txt \
 128 xymon-alerts.html \
 129 xymon-apacheconf.txt \
 130 xymon-clients.png \
 131 xymon-config.html \
 132 xymon-hosts.png \
 133 xymon-mrtg.html \
 134 xymon-tips.html \
 135 xymonmain.png \
 136 xymonprocs.png \
 137 "
128 DOCDIRS="manpages manpages/man1 manpages/man5 \ 138 DOCDIRS="manpages manpages/man1 manpages/man5 \
129 manpages/man7 manpages/man8" 139 manpages/man7 manpages/man8"
130 for dir in ${DOCDIRS}; do 140 for dir in ${DOCDIRS}; do
131 ${MKDIR} ${XYWWWDIR}/help/${dir} 141 ${MKDIR} ${XYWWWDIR}/help/${dir}
132 ${CHMOD} 0755 ${XYWWWDIR}/help/${dir} 142 ${CHMOD} 0755 ${XYWWWDIR}/help/${dir}
133 done 143 done
134 for file in ${DOCFILES}; do 144 for file in ${DOCFILES}; do
135 ${CP} ${EXAMPLEDIR}/www/help/${file} ${XYWWWDIR}/help/${file} 145 ${CP} ${EXAMPLEDIR}/www/help/${file} ${XYWWWDIR}/help/${file}
136 ${CHMOD} 0444 ${XYWWWDIR}/help/${file} 146 ${CHMOD} 0444 ${XYWWWDIR}/help/${file}
137 done 147 done
138 148
139 if [ ! -h ${BBHOME}/bin ]; then 149 if [ ! -h ${XYMONHOME}/bin ]; then
140 ${LN} -s ${XYBINDIR} ${BBHOME}/bin 150 ${LN} -s ${XYBINDIR} ${XYMONHOME}/bin
141 fi 151 fi
142 if [ ! -h ${BBHOME}/etc ]; then 152 if [ ! -h ${XYMONHOME}/etc ]; then
143 ${LN} -s ${XYETCDIR} ${BBHOME}/etc 153 ${LN} -s ${XYETCDIR} ${XYMONHOME}/etc
144 fi 154 fi
145 if [ ! -h ${BBHOME}/ext ]; then 155 if [ ! -h ${XYMONHOME}/ext ]; then
146 ${LN} -s ${XYEXTDIR} ${BBHOME}/ext 156 ${LN} -s ${XYEXTDIR} ${XYMONHOME}/ext
147 fi 157 fi
148 if [ ! -h ${BBHOME}/tmp ]; then 158 if [ ! -h ${XYMONHOME}/tmp ]; then
149 ${LN} -s ${XYTMPDIR} ${BBHOME}/tmp 159 ${LN} -s ${XYTMPDIR} ${XYMONHOME}/tmp
150 fi 160 fi
151 if [ ! -h ${BBHOME}/web ]; then 161 if [ ! -h ${XYMONHOME}/web ]; then
152 ${LN} -s ${XYWEBDIR} ${BBHOME}/web 162 ${LN} -s ${XYWEBDIR} ${XYMONHOME}/web
153 fi 163 fi
154 if [ ! -h ${BBHOME}/www ]; then 164 if [ ! -h ${XYMONHOME}/www ]; then
155 ${LN} -s ${XYWWWDIR} ${BBHOME}/www 165 ${LN} -s ${XYWWWDIR} ${XYMONHOME}/www
156 fi 166 fi
157 if [ ! -h ${BBHOME}/download ]; then 167 if [ ! -h ${XYMONHOME}/download ]; then
158 ${LN} -s ${BBVAR}/download ${BBHOME}/download 168 ${LN} -s ${XYMONVAR}/download ${XYMONHOME}/download
159 fi 169 fi
160 if [ ! -h ${BBHOME}/logs ]; then 170 if [ ! -h ${XYMONHOME}/logs ]; then
161 ${LN} -s ${BBLOGDIR} ${BBHOME}/logs 171 ${LN} -s ${XYMONLOGDIR} ${XYMONHOME}/logs
162 fi 172 fi
163 173
164 ;; 174 ;;
165esac 175esac
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/PLIST (expand / switch to unified diff)

--- pkgsrc/net/xymon/PLIST 2010/02/14 22:58:57 1.1.1.1
+++ pkgsrc/net/xymon/PLIST 2011/04/22 14:52:18 1.2
@@ -1,180 +1,187 @@ @@ -1,180 +1,187 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/14 22:58:57 spz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2011/04/22 14:52:18 spz Exp $
 2libexec/xymon/ackinfo.cgi
 3libexec/xymon/acknowledge.cgi
2libexec/xymon/bb 4libexec/xymon/bb
3libexec/xymon/bb-ack.cgi 
4libexec/xymon/bb-csvinfo.cgi 
5libexec/xymon/bb-datepage.cgi 
6libexec/xymon/bb-eventlog.cgi 
7libexec/xymon/bb-findhost.cgi 
8libexec/xymon/bb-hist.cgi 
9libexec/xymon/bb-rep.cgi 
10libexec/xymon/bb-replog.cgi 
11libexec/xymon/bb-snapshot.cgi 
12libexec/xymon/bb-webpage 
13libexec/xymon/bbcmd 5libexec/xymon/bbcmd
14libexec/xymon/bbcombotest 
15libexec/xymon/bbdigest 6libexec/xymon/bbdigest
16libexec/xymon/bbgen 
17libexec/xymon/bbhostgrep 7libexec/xymon/bbhostgrep
18libexec/xymon/bbhostshow 8libexec/xymon/bbhostshow
19libexec/xymon/bbmessage.cgi 
20libexec/xymon/bbproxy 
21libexec/xymon/bbtest-net 
22libexec/xymon/beastat 9libexec/xymon/beastat
23libexec/xymon/boilerplate.cgi 10libexec/xymon/boilerplate.cgi
24libexec/xymon/cgi-bin/bb-csvinfo.sh 11libexec/xymon/cgi-bin/certreport.sh
25libexec/xymon/cgi-bin/bb-datepage.sh 12libexec/xymon/cgi-bin/columndoc.sh
26libexec/xymon/cgi-bin/bb-eventlog.sh 13libexec/xymon/cgi-bin/confreport-critical.sh
27libexec/xymon/cgi-bin/bb-findhost.sh 14libexec/xymon/cgi-bin/confreport.sh
28libexec/xymon/cgi-bin/bb-hist.sh 15libexec/xymon/cgi-bin/criticalview.sh
29libexec/xymon/cgi-bin/bb-histlog.sh 16libexec/xymon/cgi-bin/csvinfo.sh
30libexec/xymon/cgi-bin/bb-hostsvc.sh 17libexec/xymon/cgi-bin/datepage.sh
31libexec/xymon/cgi-bin/bb-rep.sh 18libexec/xymon/cgi-bin/eventlog.sh
32libexec/xymon/cgi-bin/bb-replog.sh 19libexec/xymon/cgi-bin/findhost.sh
33libexec/xymon/cgi-bin/bb-snapshot.sh 20libexec/xymon/cgi-bin/ghostlist.sh
34libexec/xymon/cgi-bin/hobbit-certreport.sh 21libexec/xymon/cgi-bin/history.sh
35libexec/xymon/cgi-bin/hobbit-confreport-critical.sh 22libexec/xymon/cgi-bin/historylog.sh
36libexec/xymon/cgi-bin/hobbit-confreport.sh 23libexec/xymon/cgi-bin/hostgraphs.sh
37libexec/xymon/cgi-bin/hobbit-ghosts.sh 24libexec/xymon/cgi-bin/hostlist.sh
38libexec/xymon/cgi-bin/hobbit-hostgraphs.sh 25libexec/xymon/cgi-bin/nongreen.sh
39libexec/xymon/cgi-bin/hobbit-hostlist.sh 26libexec/xymon/cgi-bin/notifications.sh
40libexec/xymon/cgi-bin/hobbit-nkview.sh 27libexec/xymon/cgi-bin/perfdata.sh
41libexec/xymon/cgi-bin/hobbit-nongreen.sh 28libexec/xymon/cgi-bin/report.sh
42libexec/xymon/cgi-bin/hobbit-notifylog.sh 29libexec/xymon/cgi-bin/reportlog.sh
43libexec/xymon/cgi-bin/hobbit-perfdata.sh 30libexec/xymon/cgi-bin/showgraph.sh
44libexec/xymon/cgi-bin/hobbit-topchanges.sh 31libexec/xymon/cgi-bin/snapshot.sh
45libexec/xymon/cgi-bin/hobbitcolumn.sh 32libexec/xymon/cgi-bin/svcstatus.sh
46libexec/xymon/cgi-bin/hobbitgraph.sh 33libexec/xymon/cgi-bin/topchanges.sh
47libexec/xymon/cgi-secure/bb-ack.sh 34libexec/xymon/cgi-secure/ackinfo.sh
48libexec/xymon/cgi-secure/hobbit-ackinfo.sh 35libexec/xymon/cgi-secure/acknowledge.sh
49libexec/xymon/cgi-secure/hobbit-enadis.sh 36libexec/xymon/cgi-secure/criticaleditor.sh
50libexec/xymon/cgi-secure/hobbit-nkedit.sh 37libexec/xymon/cgi-secure/enadis.sh
51libexec/xymon/cgi-secure/hobbit-useradm.sh 38libexec/xymon/cgi-secure/useradm.sh
 39libexec/xymon/combostatus
 40libexec/xymon/confreport.cgi
52libexec/xymon/convertnk 41libexec/xymon/convertnk
53libexec/xymon/ext/bbretest-net.sh 42libexec/xymon/criticaleditor.cgi
54libexec/xymon/hobbit-ackinfo.cgi 43libexec/xymon/criticalview.cgi
55libexec/xymon/hobbit-confreport.cgi 44libexec/xymon/csvinfo.cgi
56libexec/xymon/hobbit-enadis.cgi 45libexec/xymon/datepage.cgi
57libexec/xymon/hobbit-ghosts.cgi 46libexec/xymon/enadis.cgi
58libexec/xymon/hobbit-hostgraphs.cgi 47libexec/xymon/eventlog.cgi
59libexec/xymon/hobbit-hostlist.cgi 48libexec/xymon/ext/xymonnet-again.sh
60libexec/xymon/hobbit-mailack 49libexec/xymon/findhost.cgi
61libexec/xymon/hobbit-nkedit.cgi 50libexec/xymon/ghostlist.cgi
62libexec/xymon/hobbit-nkview.cgi 51libexec/xymon/history.cgi
63libexec/xymon/hobbit-notifylog.cgi 52libexec/xymon/hostgraphs.cgi
64libexec/xymon/hobbit-perfdata.cgi 53libexec/xymon/hostlist.cgi
65libexec/xymon/hobbit-statusreport.cgi 
66libexec/xymon/hobbit-useradm.cgi 
67libexec/xymon/hobbit.sh 
68libexec/xymon/hobbitd 
69libexec/xymon/hobbitd_alert 
70libexec/xymon/hobbitd_capture 
71libexec/xymon/hobbitd_channel 
72libexec/xymon/hobbitd_client 
73libexec/xymon/hobbitd_filestore 
74libexec/xymon/hobbitd_history 
75libexec/xymon/hobbitd_hostdata 
76libexec/xymon/hobbitd_larrd 
77libexec/xymon/hobbitd_locator 
78libexec/xymon/hobbitd_rrd 
79libexec/xymon/hobbitd_sample 
80libexec/xymon/hobbitfetch 
81libexec/xymon/hobbitgraph.cgi 
82libexec/xymon/hobbitlaunch 
83libexec/xymon/hobbitping 
84libexec/xymon/hobbitreports.sh 
85libexec/xymon/hobbitsvc.cgi 
86libexec/xymon/moverrd.sh 54libexec/xymon/moverrd.sh
 55libexec/xymon/notifications.cgi
 56libexec/xymon/perfdata.cgi
 57libexec/xymon/report.cgi
 58libexec/xymon/reportlog.cgi
87libexec/xymon/rrdcachectl 59libexec/xymon/rrdcachectl
 60libexec/xymon/showgraph.cgi
 61libexec/xymon/snapshot.cgi
 62libexec/xymon/statusreport.cgi
 63libexec/xymon/svcstatus.cgi
88libexec/xymon/trimhistory 64libexec/xymon/trimhistory
89man/man1/bb-ack.cgi.1 65libexec/xymon/useradm.cgi
90man/man1/bb-csvinfo.cgi.1 66libexec/xymon/xymon
91man/man1/bb-datepage.cgi.1 67libexec/xymon/xymon-mailack
92man/man1/bb-eventlog.cgi.1 68libexec/xymon/xymon.sh
93man/man1/bb-findhost.cgi.1 69libexec/xymon/xymoncfg
94man/man1/bb-hist.cgi.1 70libexec/xymon/xymoncgimsg.cgi
95man/man1/bb-rep.cgi.1 71libexec/xymon/xymoncmd
96man/man1/bb-replog.cgi.1 72libexec/xymon/xymond
97man/man1/bb-snapshot.cgi.1 73libexec/xymon/xymond_alert
98man/man1/bb-webpage.cgi.1 74libexec/xymon/xymond_capture
99man/man1/bb.1 75libexec/xymon/xymond_channel
100man/man1/bbcmd.1 76libexec/xymon/xymond_client
101man/man1/bbcombotest.1 77libexec/xymon/xymond_filestore
102man/man1/bbdigest.1 78libexec/xymon/xymond_history
103man/man1/bbgen.1 79libexec/xymon/xymond_hostdata
104man/man1/bbhostgrep.1 80libexec/xymon/xymond_locator
105man/man1/bbhostshow.1 81libexec/xymon/xymond_rrd
106man/man1/bbretest-net.sh.1 82libexec/xymon/xymond_sample
107man/man1/bbtest-net.1 83libexec/xymon/xymondigest
 84libexec/xymon/xymonfetch
 85libexec/xymon/xymongen
 86libexec/xymon/xymongrep
 87libexec/xymon/xymonlaunch
 88libexec/xymon/xymonnet
 89libexec/xymon/xymonpage
 90libexec/xymon/xymonping
 91libexec/xymon/xymonproxy
 92libexec/xymon/xymonreports.sh
 93man/man1/ackinfo.cgi.1
 94man/man1/acknowledge.cgi.1
108man/man1/clientupdate.1 95man/man1/clientupdate.1
109man/man1/hobbit-ackinfo.cgi.1 96man/man1/combostatus.1
110man/man1/hobbit-confreport.cgi.1 97man/man1/confreport.cgi.1
111man/man1/hobbit-ghosts.cgi.1 98man/man1/criticaleditor.cgi.1
112man/man1/hobbit-hostgraphs.cgi.1 99man/man1/criticalview.cgi.1
113man/man1/hobbit-nkedit.cgi.1 100man/man1/csvinfo.cgi.1
114man/man1/hobbit-nkview.cgi.1 101man/man1/datepage.cgi.1
115man/man1/hobbit-statusreport.cgi.1 102man/man1/eventlog.cgi.1
116man/man1/hobbitgraph.cgi.1 103man/man1/findhost.cgi.1
117man/man1/hobbitping.1 104man/man1/ghostlist.cgi.1
118man/man1/hobbitsvc.cgi.1 105man/man1/history.cgi.1
 106man/man1/hostgraphs.cgi.1
119man/man1/logfetch.1 107man/man1/logfetch.1
120man/man1/orcahobbit.1 108man/man1/orcaxymon.1
121man/man5/bb-hosts.5 109man/man1/report.cgi.1
122man/man5/bb-services.5 110man/man1/reportlog.cgi.1
123man/man5/bbcombotest.cfg.5 111man/man1/showgraph.cgi.1
 112man/man1/snapshot.cgi.1
 113man/man1/statusreport.cgi.1
 114man/man1/svcstatus.cgi.1
 115man/man1/xymon.1
 116man/man1/xymoncfg.1
 117man/man1/xymoncmd.1
 118man/man1/xymondigest.1
 119man/man1/xymongen.1
 120man/man1/xymongrep.1
 121man/man1/xymonnet-again.sh.1
 122man/man1/xymonnet.1
 123man/man1/xymonpage.cgi.1
 124man/man1/xymonping.1
 125man/man5/alerts.cfg.5
 126man/man5/analysis.cfg.5
 127man/man5/cgioptions.cfg.5
124man/man5/client-local.cfg.5 128man/man5/client-local.cfg.5
125man/man5/clientlaunch.cfg.5 129man/man5/clientlaunch.cfg.5
126man/man5/hobbit-alerts.cfg.5 130man/man5/combo.cfg.5
127man/man5/hobbit-clients.cfg.5 131man/man5/critical.cfg.5
128man/man5/hobbit-nkview.cfg.5 132man/man5/graphs.cfg.5
129man/man5/hobbitcgi.cfg.5 133man/man5/hosts.cfg.5
130man/man5/hobbitclient.cfg.5 134man/man5/protocols.cfg.5
131man/man5/hobbitgraph.cfg.5 135man/man5/tasks.cfg.5
132man/man5/hobbitlaunch.cfg.5 136man/man5/xymon-xmh.5
133man/man5/hobbitserver.cfg.5 137man/man5/xymonclient.cfg.5
134man/man5/hobbitweb.5 138man/man5/xymonserver.cfg.5
 139man/man5/xymonweb.5
135man/man7/xymon.7 140man/man7/xymon.7
136man/man8/bbmessage.cgi.8 141man/man8/enadis.cgi.8
137man/man8/bbproxy.8 
138man/man8/hobbit-enadis.cgi.8 
139man/man8/hobbit-mailack.8 
140man/man8/hobbitd.8 
141man/man8/hobbitd_alert.8 
142man/man8/hobbitd_channel.8 
143man/man8/hobbitd_client.8 
144man/man8/hobbitd_filestore.8 
145man/man8/hobbitd_history.8 
146man/man8/hobbitd_hostdata.8 
147man/man8/hobbitd_rrd.8 
148man/man8/hobbitd_sample.8 
149man/man8/hobbitfetch.8 
150man/man8/hobbitlaunch.8 
151man/man8/msgcache.8 142man/man8/msgcache.8
152man/man8/trimhistory.8 143man/man8/trimhistory.8
 144man/man8/xymon-mailack.8
 145man/man8/xymoncgimsg.cgi.8
 146man/man8/xymond.8
 147man/man8/xymond_alert.8
 148man/man8/xymond_capture.8
 149man/man8/xymond_channel.8
 150man/man8/xymond_client.8
 151man/man8/xymond_filestore.8
 152man/man8/xymond_history.8
 153man/man8/xymond_hostdata.8
 154man/man8/xymond_rrd.8
 155man/man8/xymond_sample.8
 156man/man8/xymonfetch.8
 157man/man8/xymonlaunch.8
 158man/man8/xymonproxy.8
153share/examples/rc.d/xymon 159share/examples/rc.d/xymon
154share/examples/xymon/bb-hosts 160share/examples/xymon/alerts.cfg
155share/examples/xymon/bb-services 161share/examples/xymon/analysis.cfg
156share/examples/xymon/bbcombotest.cfg 162share/examples/xymon/cgioptions.cfg
157share/examples/xymon/client-local.cfg 163share/examples/xymon/client-local.cfg
158share/examples/xymon/columndoc.csv 164share/examples/xymon/columndoc.csv
159share/examples/xymon/hobbit-alerts.cfg 165share/examples/xymon/combo.cfg
160share/examples/xymon/hobbit-apache.conf 166share/examples/xymon/critical.cfg
161share/examples/xymon/hobbit-clients.cfg 167share/examples/xymon/critical.cfg.bak
162share/examples/xymon/hobbit-nkview.cfg 168share/examples/xymon/graphs.cfg
163share/examples/xymon/hobbit-nkview.cfg.bak 169share/examples/xymon/holidays.cfg
164share/examples/xymon/hobbitcgi.cfg 170share/examples/xymon/hosts.cfg
165share/examples/xymon/hobbitgraph.cfg 171share/examples/xymon/protocols.cfg
166share/examples/xymon/hobbitlaunch.cfg 172share/examples/xymon/rrddefinitions.cfg
167share/examples/xymon/hobbitserver.cfg 173share/examples/xymon/snmpmibs.cfg
 174share/examples/xymon/tasks.cfg
168share/examples/xymon/www/gifs/README 175share/examples/xymon/www/gifs/README
169share/examples/xymon/www/gifs/arrow.gif 176share/examples/xymon/www/gifs/arrow.gif
170share/examples/xymon/www/gifs/bkg-blue.gif 177share/examples/xymon/www/gifs/bkg-blue.gif
171share/examples/xymon/www/gifs/bkg-clear.gif 178share/examples/xymon/www/gifs/bkg-clear.gif
172share/examples/xymon/www/gifs/bkg-green.gif 179share/examples/xymon/www/gifs/bkg-green.gif
173share/examples/xymon/www/gifs/bkg-purple.gif 180share/examples/xymon/www/gifs/bkg-purple.gif
174share/examples/xymon/www/gifs/bkg-red.gif 181share/examples/xymon/www/gifs/bkg-red.gif
175share/examples/xymon/www/gifs/bkg-yellow.gif 182share/examples/xymon/www/gifs/bkg-yellow.gif
176share/examples/xymon/www/gifs/blue-ack.gif 183share/examples/xymon/www/gifs/blue-ack.gif
177share/examples/xymon/www/gifs/blue-recent.gif 184share/examples/xymon/www/gifs/blue-recent.gif
178share/examples/xymon/www/gifs/blue.gif 185share/examples/xymon/www/gifs/blue.gif
179share/examples/xymon/www/gifs/clear-recent.gif 186share/examples/xymon/www/gifs/clear-recent.gif
180share/examples/xymon/www/gifs/clear.gif 187share/examples/xymon/www/gifs/clear.gif
@@ -185,202 +192,213 @@ share/examples/xymon/www/gifs/favicon-pu @@ -185,202 +192,213 @@ share/examples/xymon/www/gifs/favicon-pu
185share/examples/xymon/www/gifs/favicon-red.ico 192share/examples/xymon/www/gifs/favicon-red.ico
186share/examples/xymon/www/gifs/favicon-unknown.ico 193share/examples/xymon/www/gifs/favicon-unknown.ico
187share/examples/xymon/www/gifs/favicon-yellow.ico 194share/examples/xymon/www/gifs/favicon-yellow.ico
188share/examples/xymon/www/gifs/green-recent.gif 195share/examples/xymon/www/gifs/green-recent.gif
189share/examples/xymon/www/gifs/green.gif 196share/examples/xymon/www/gifs/green.gif
190share/examples/xymon/www/gifs/purple-ack.gif 197share/examples/xymon/www/gifs/purple-ack.gif
191share/examples/xymon/www/gifs/purple-recent.gif 198share/examples/xymon/www/gifs/purple-recent.gif
192share/examples/xymon/www/gifs/purple.gif 199share/examples/xymon/www/gifs/purple.gif
193share/examples/xymon/www/gifs/red-ack.gif 200share/examples/xymon/www/gifs/red-ack.gif
194share/examples/xymon/www/gifs/red-recent.gif 201share/examples/xymon/www/gifs/red-recent.gif
195share/examples/xymon/www/gifs/red.gif 202share/examples/xymon/www/gifs/red.gif
196share/examples/xymon/www/gifs/unknown-recent.gif 203share/examples/xymon/www/gifs/unknown-recent.gif
197share/examples/xymon/www/gifs/unknown.gif 204share/examples/xymon/www/gifs/unknown.gif
 205share/examples/xymon/www/gifs/xymonbody.css
198share/examples/xymon/www/gifs/yellow-ack.gif 206share/examples/xymon/www/gifs/yellow-ack.gif
199share/examples/xymon/www/gifs/yellow-recent.gif 207share/examples/xymon/www/gifs/yellow-recent.gif
200share/examples/xymon/www/gifs/yellow.gif 208share/examples/xymon/www/gifs/yellow.gif
201share/examples/xymon/www/gifs/zoom.gif 209share/examples/xymon/www/gifs/zoom.gif
 210share/examples/xymon/www/help/Renaming-430.txt
202share/examples/xymon/www/help/about.html 211share/examples/xymon/www/help/about.html
203share/examples/xymon/www/help/bb-to-hobbit.html 212share/examples/xymon/www/help/bb-to-xymon.html
204share/examples/xymon/www/help/clonewarn.jpg 213share/examples/xymon/www/help/clonewarn.jpg
205share/examples/xymon/www/help/configure.txt 214share/examples/xymon/www/help/configure.txt
206share/examples/xymon/www/help/criticalsystems.html 215share/examples/xymon/www/help/criticalsystems.html
207share/examples/xymon/www/help/critview-detail-acked.jpg 216share/examples/xymon/www/help/critview-detail-acked.jpg
208share/examples/xymon/www/help/critview-detail-ackform.jpg 217share/examples/xymon/www/help/critview-detail-ackform.jpg
209share/examples/xymon/www/help/critview-detail.jpg 218share/examples/xymon/www/help/critview-detail.jpg
210share/examples/xymon/www/help/critview-disk.jpg 219share/examples/xymon/www/help/critview-disk.jpg
211share/examples/xymon/www/help/critview-green.jpg 220share/examples/xymon/www/help/critview-green.jpg
212share/examples/xymon/www/help/editor-clonemaster.jpg 221share/examples/xymon/www/help/editor-clonemaster.jpg
213share/examples/xymon/www/help/editor-diskchanged.jpg 222share/examples/xymon/www/help/editor-diskchanged.jpg
214share/examples/xymon/www/help/editor-disksetup.jpg 223share/examples/xymon/www/help/editor-disksetup.jpg
215share/examples/xymon/www/help/editor-main.jpg 224share/examples/xymon/www/help/editor-main.jpg
216share/examples/xymon/www/help/editor-makeclone.jpg 225share/examples/xymon/www/help/editor-makeclone.jpg
217share/examples/xymon/www/help/editor-nohost.jpg 226share/examples/xymon/www/help/editor-nohost.jpg
218share/examples/xymon/www/help/editor-showclone.jpg 227share/examples/xymon/www/help/editor-showclone.jpg
219share/examples/xymon/www/help/hobbit-alerts.html 
220share/examples/xymon/www/help/hobbit-apacheconf.txt 
221share/examples/xymon/www/help/hobbit-bbhosts.png 
222share/examples/xymon/www/help/hobbit-clients.png 
223share/examples/xymon/www/help/hobbit-config.html 
224share/examples/xymon/www/help/hobbit-mrtg.html 
225share/examples/xymon/www/help/hobbit-tips.html 
226share/examples/xymon/www/help/hobbitmain.png 
227share/examples/xymon/www/help/hobbitprocs.png 
228share/examples/xymon/www/help/howtograph.html 228share/examples/xymon/www/help/howtograph.html
229share/examples/xymon/www/help/install.html 229share/examples/xymon/www/help/install.html
230share/examples/xymon/www/help/known-issues.html 230share/examples/xymon/www/help/known-issues.html
231share/examples/xymon/www/help/mainview-acked.jpg 231share/examples/xymon/www/help/mainview-acked.jpg
232share/examples/xymon/www/help/mainview.jpg 232share/examples/xymon/www/help/mainview.jpg
233share/examples/xymon/www/help/manpages/index.html 233share/examples/xymon/www/help/manpages/index.html
234share/examples/xymon/www/help/manpages/man1/bb-ack.cgi.1.html 234share/examples/xymon/www/help/manpages/man1/ackinfo.cgi.1.html
235share/examples/xymon/www/help/manpages/man1/bb-csvinfo.cgi.1.html 235share/examples/xymon/www/help/manpages/man1/acknowledge.cgi.1.html
236share/examples/xymon/www/help/manpages/man1/bb-datepage.cgi.1.html 
237share/examples/xymon/www/help/manpages/man1/bb-eventlog.cgi.1.html 
238share/examples/xymon/www/help/manpages/man1/bb-findhost.cgi.1.html 
239share/examples/xymon/www/help/manpages/man1/bb-hist.cgi.1.html 
240share/examples/xymon/www/help/manpages/man1/bb-rep.cgi.1.html 
241share/examples/xymon/www/help/manpages/man1/bb-replog.cgi.1.html 
242share/examples/xymon/www/help/manpages/man1/bb-snapshot.cgi.1.html 
243share/examples/xymon/www/help/manpages/man1/bb-webpage.cgi.1.html 
244share/examples/xymon/www/help/manpages/man1/bb.1.html 
245share/examples/xymon/www/help/manpages/man1/bbcmd.1.html 
246share/examples/xymon/www/help/manpages/man1/bbcombotest.1.html 
247share/examples/xymon/www/help/manpages/man1/bbdigest.1.html 
248share/examples/xymon/www/help/manpages/man1/bbgen.1.html 
249share/examples/xymon/www/help/manpages/man1/bbhostgrep.1.html 
250share/examples/xymon/www/help/manpages/man1/bbhostshow.1.html 
251share/examples/xymon/www/help/manpages/man1/bbretest-net.sh.1.html 
252share/examples/xymon/www/help/manpages/man1/bbtest-net.1.html 
253share/examples/xymon/www/help/manpages/man1/clientupdate.1.html 236share/examples/xymon/www/help/manpages/man1/clientupdate.1.html
254share/examples/xymon/www/help/manpages/man1/hobbit-ackinfo.cgi.1.html 237share/examples/xymon/www/help/manpages/man1/combostatus.1.html
255share/examples/xymon/www/help/manpages/man1/hobbit-confreport.cgi.1.html 238share/examples/xymon/www/help/manpages/man1/confreport.cgi.1.html
256share/examples/xymon/www/help/manpages/man1/hobbit-ghosts.cgi.1.html 239share/examples/xymon/www/help/manpages/man1/criticaleditor.cgi.1.html
257share/examples/xymon/www/help/manpages/man1/hobbit-hostgraphs.cgi.1.html 240share/examples/xymon/www/help/manpages/man1/criticalview.cgi.1.html
258share/examples/xymon/www/help/manpages/man1/hobbit-nkedit.cgi.1.html 241share/examples/xymon/www/help/manpages/man1/csvinfo.cgi.1.html
259share/examples/xymon/www/help/manpages/man1/hobbit-nkview.cgi.1.html 242share/examples/xymon/www/help/manpages/man1/datepage.cgi.1.html
260share/examples/xymon/www/help/manpages/man1/hobbit-statusreport.cgi.1.html 243share/examples/xymon/www/help/manpages/man1/eventlog.cgi.1.html
261share/examples/xymon/www/help/manpages/man1/hobbitgraph.cgi.1.html 244share/examples/xymon/www/help/manpages/man1/findhost.cgi.1.html
262share/examples/xymon/www/help/manpages/man1/hobbitping.1.html 245share/examples/xymon/www/help/manpages/man1/ghostlist.cgi.1.html
263share/examples/xymon/www/help/manpages/man1/hobbitsvc.cgi.1.html 246share/examples/xymon/www/help/manpages/man1/history.cgi.1.html
 247share/examples/xymon/www/help/manpages/man1/hostgraphs.cgi.1.html
264share/examples/xymon/www/help/manpages/man1/logfetch.1.html 248share/examples/xymon/www/help/manpages/man1/logfetch.1.html
265share/examples/xymon/www/help/manpages/man1/orcahobbit.1.html 249share/examples/xymon/www/help/manpages/man1/orcaxymon.1.html
266share/examples/xymon/www/help/manpages/man5/bb-hosts.5.html 250share/examples/xymon/www/help/manpages/man1/report.cgi.1.html
267share/examples/xymon/www/help/manpages/man5/bb-services.5.html 251share/examples/xymon/www/help/manpages/man1/reportlog.cgi.1.html
268share/examples/xymon/www/help/manpages/man5/bbcombotest.cfg.5.html 252share/examples/xymon/www/help/manpages/man1/showgraph.cgi.1.html
 253share/examples/xymon/www/help/manpages/man1/snapshot.cgi.1.html
 254share/examples/xymon/www/help/manpages/man1/statusreport.cgi.1.html
 255share/examples/xymon/www/help/manpages/man1/svcstatus.cgi.1.html
 256share/examples/xymon/www/help/manpages/man1/xymon.1.html
 257share/examples/xymon/www/help/manpages/man1/xymoncfg.1.html
 258share/examples/xymon/www/help/manpages/man1/xymoncmd.1.html
 259share/examples/xymon/www/help/manpages/man1/xymondigest.1.html
 260share/examples/xymon/www/help/manpages/man1/xymongen.1.html
 261share/examples/xymon/www/help/manpages/man1/xymongrep.1.html
 262share/examples/xymon/www/help/manpages/man1/xymonnet-again.sh.1.html
 263share/examples/xymon/www/help/manpages/man1/xymonnet.1.html
 264share/examples/xymon/www/help/manpages/man1/xymonpage.cgi.1.html
 265share/examples/xymon/www/help/manpages/man1/xymonping.1.html
 266share/examples/xymon/www/help/manpages/man5/alerts.cfg.5.html
 267share/examples/xymon/www/help/manpages/man5/analysis.cfg.5.html
 268share/examples/xymon/www/help/manpages/man5/cgioptions.cfg.5.html
269share/examples/xymon/www/help/manpages/man5/client-local.cfg.5.html 269share/examples/xymon/www/help/manpages/man5/client-local.cfg.5.html
270share/examples/xymon/www/help/manpages/man5/clientlaunch.cfg.5.html 270share/examples/xymon/www/help/manpages/man5/clientlaunch.cfg.5.html
271share/examples/xymon/www/help/manpages/man5/hobbit-alerts.cfg.5.html 271share/examples/xymon/www/help/manpages/man5/combo.cfg.5.html
272share/examples/xymon/www/help/manpages/man5/hobbit-clients.cfg.5.html 272share/examples/xymon/www/help/manpages/man5/critical.cfg.5.html
273share/examples/xymon/www/help/manpages/man5/hobbit-nkview.cfg.5.html 273share/examples/xymon/www/help/manpages/man5/graphs.cfg.5.html
274share/examples/xymon/www/help/manpages/man5/hobbitcgi.cfg.5.html 274share/examples/xymon/www/help/manpages/man5/hosts.cfg.5.html
275share/examples/xymon/www/help/manpages/man5/hobbitclient.cfg.5.html 275share/examples/xymon/www/help/manpages/man5/protocols.cfg.5.html
276share/examples/xymon/www/help/manpages/man5/hobbitgraph.cfg.5.html 276share/examples/xymon/www/help/manpages/man5/tasks.cfg.5.html
277share/examples/xymon/www/help/manpages/man5/hobbitlaunch.cfg.5.html 277share/examples/xymon/www/help/manpages/man5/xymon-xmh.5.html
278share/examples/xymon/www/help/manpages/man5/hobbitserver.cfg.5.html 278share/examples/xymon/www/help/manpages/man5/xymonclient.cfg.5.html
279share/examples/xymon/www/help/manpages/man5/hobbitweb.5.html 279share/examples/xymon/www/help/manpages/man5/xymonserver.cfg.5.html
 280share/examples/xymon/www/help/manpages/man5/xymonweb.5.html
280share/examples/xymon/www/help/manpages/man7/xymon.7.html 281share/examples/xymon/www/help/manpages/man7/xymon.7.html
281share/examples/xymon/www/help/manpages/man8/bbmessage.cgi.8.html 282share/examples/xymon/www/help/manpages/man8/enadis.cgi.8.html
282share/examples/xymon/www/help/manpages/man8/bbproxy.8.html 
283share/examples/xymon/www/help/manpages/man8/hobbit-enadis.cgi.8.html 
284share/examples/xymon/www/help/manpages/man8/hobbit-mailack.8.html 
285share/examples/xymon/www/help/manpages/man8/hobbitd.8.html 
286share/examples/xymon/www/help/manpages/man8/hobbitd_alert.8.html 
287share/examples/xymon/www/help/manpages/man8/hobbitd_channel.8.html 
288share/examples/xymon/www/help/manpages/man8/hobbitd_client.8.html 
289share/examples/xymon/www/help/manpages/man8/hobbitd_filestore.8.html 
290share/examples/xymon/www/help/manpages/man8/hobbitd_history.8.html 
291share/examples/xymon/www/help/manpages/man8/hobbitd_hostdata.8.html 
292share/examples/xymon/www/help/manpages/man8/hobbitd_rrd.8.html 
293share/examples/xymon/www/help/manpages/man8/hobbitd_sample.8.html 
294share/examples/xymon/www/help/manpages/man8/hobbitfetch.8.html 
295share/examples/xymon/www/help/manpages/man8/hobbitlaunch.8.html 
296share/examples/xymon/www/help/manpages/man8/msgcache.8.html 283share/examples/xymon/www/help/manpages/man8/msgcache.8.html
297share/examples/xymon/www/help/manpages/man8/trimhistory.8.html 284share/examples/xymon/www/help/manpages/man8/trimhistory.8.html
 285share/examples/xymon/www/help/manpages/man8/xymon-mailack.8.html
 286share/examples/xymon/www/help/manpages/man8/xymoncgimsg.cgi.8.html
 287share/examples/xymon/www/help/manpages/man8/xymond.8.html
 288share/examples/xymon/www/help/manpages/man8/xymond_alert.8.html
 289share/examples/xymon/www/help/manpages/man8/xymond_capture.8.html
 290share/examples/xymon/www/help/manpages/man8/xymond_channel.8.html
 291share/examples/xymon/www/help/manpages/man8/xymond_client.8.html
 292share/examples/xymon/www/help/manpages/man8/xymond_filestore.8.html
 293share/examples/xymon/www/help/manpages/man8/xymond_history.8.html
 294share/examples/xymon/www/help/manpages/man8/xymond_hostdata.8.html
 295share/examples/xymon/www/help/manpages/man8/xymond_rrd.8.html
 296share/examples/xymon/www/help/manpages/man8/xymond_sample.8.html
 297share/examples/xymon/www/help/manpages/man8/xymonfetch.8.html
 298share/examples/xymon/www/help/manpages/man8/xymonlaunch.8.html
 299share/examples/xymon/www/help/manpages/man8/xymonproxy.8.html
298share/examples/xymon/www/help/stdview-detail-acked.jpg 300share/examples/xymon/www/help/stdview-detail-acked.jpg
299share/examples/xymon/www/menu/README 301share/examples/xymon/www/help/upgrade-to-430.txt
300share/examples/xymon/www/menu/menu.css 302share/examples/xymon/www/help/xymon-alerts.html
301share/examples/xymon/www/menu/menu.js 303share/examples/xymon/www/help/xymon-apacheconf.txt
302share/examples/xymon/www/menu/menu_items.js 304share/examples/xymon/www/help/xymon-clients.png
303share/examples/xymon/www/menu/menu_tpl.js 305share/examples/xymon/www/help/xymon-config.html
 306share/examples/xymon/www/help/xymon-hosts.png
 307share/examples/xymon/www/help/xymon-mrtg.html
 308share/examples/xymon/www/help/xymon-tips.html
 309share/examples/xymon/www/help/xymonmain.png
 310share/examples/xymon/www/help/xymonprocs.png
 311share/examples/xymon/www/menu/b2t-blue.gif
 312share/examples/xymon/www/menu/b2t-grey.gif
 313share/examples/xymon/www/menu/t2b-blue.gif
 314share/examples/xymon/www/menu/t2b-grey.gif
 315share/examples/xymon/www/menu/xymonmenu-blue.css
 316share/examples/xymon/www/menu/xymonmenu-grey.css
 317share/examples/xymon/xymon-apache.conf
 318share/examples/xymon/xymonmenu.cfg
 319share/examples/xymon/xymonserver.cfg
304share/xymon/web/acknowledge_footer 320share/xymon/web/acknowledge_footer
305share/xymon/web/acknowledge_form 321share/xymon/web/acknowledge_form
306share/xymon/web/acknowledge_header 322share/xymon/web/acknowledge_header
307share/xymon/web/bb2_footer 
308share/xymon/web/bb2_header 
309share/xymon/web/bb_footer 
310share/xymon/web/bb_header 
311share/xymon/web/bbnk_footer 
312share/xymon/web/bbnk_header 
313share/xymon/web/bbrep_footer 
314share/xymon/web/bbrep_header 
315share/xymon/web/bbsnap2_footer 
316share/xymon/web/bbsnap2_header 
317share/xymon/web/bbsnap_footer 
318share/xymon/web/bbsnap_header 
319share/xymon/web/bbsnapnk_footer 
320share/xymon/web/bbsnapnk_header 
321share/xymon/web/columndoc_footer 323share/xymon/web/columndoc_footer
322share/xymon/web/columndoc_header 324share/xymon/web/columndoc_header
323share/xymon/web/confreport_back 325share/xymon/web/confreport_back
324share/xymon/web/confreport_footer 326share/xymon/web/confreport_footer
325share/xymon/web/confreport_front 327share/xymon/web/confreport_front
326share/xymon/web/confreport_header 328share/xymon/web/confreport_header
 329share/xymon/web/critack_form
 330share/xymon/web/critedit_footer
 331share/xymon/web/critedit_form
 332share/xymon/web/critedit_header
 333share/xymon/web/critical_footer
 334share/xymon/web/critical_header
327share/xymon/web/event_footer 335share/xymon/web/event_footer
328share/xymon/web/event_form 336share/xymon/web/event_form
329share/xymon/web/event_header 337share/xymon/web/event_header
330share/xymon/web/findhost_footer 338share/xymon/web/findhost_footer
331share/xymon/web/findhost_form 339share/xymon/web/findhost_form
332share/xymon/web/findhost_header 340share/xymon/web/findhost_header
333share/xymon/web/ghosts_footer 341share/xymon/web/ghosts_footer
334share/xymon/web/ghosts_header 342share/xymon/web/ghosts_header
335share/xymon/web/graphs_footer 343share/xymon/web/graphs_footer
336share/xymon/web/graphs_header 344share/xymon/web/graphs_header
337share/xymon/web/hist_footer 345share/xymon/web/hist_footer
338share/xymon/web/hist_header 346share/xymon/web/hist_header
339share/xymon/web/histlog_footer 347share/xymon/web/histlog_footer
340share/xymon/web/histlog_header 348share/xymon/web/histlog_header
341share/xymon/web/hobbitnk_footer 
342share/xymon/web/hobbitnk_header 
343share/xymon/web/hostgraphs_footer 349share/xymon/web/hostgraphs_footer
344share/xymon/web/hostgraphs_form 350share/xymon/web/hostgraphs_form
345share/xymon/web/hostgraphs_header 351share/xymon/web/hostgraphs_header
346share/xymon/web/hostlist_footer 352share/xymon/web/hostlist_footer
347share/xymon/web/hostlist_form 353share/xymon/web/hostlist_form
348share/xymon/web/hostlist_header 354share/xymon/web/hostlist_header
349share/xymon/web/hostsvc_footer 355share/xymon/web/hostsvc_footer
350share/xymon/web/hostsvc_header 356share/xymon/web/hostsvc_header
351share/xymon/web/info_footer 357share/xymon/web/info_footer
352share/xymon/web/info_header 358share/xymon/web/info_header
353share/xymon/web/maint_footer 359share/xymon/web/maint_footer
354share/xymon/web/maint_form 360share/xymon/web/maint_form
355share/xymon/web/maint_header 361share/xymon/web/maint_header
356share/xymon/web/maintact_footer 362share/xymon/web/maintact_footer
357share/xymon/web/maintact_header 363share/xymon/web/maintact_header
358share/xymon/web/nkack_form 
359share/xymon/web/nkedit_footer 
360share/xymon/web/nkedit_form 
361share/xymon/web/nkedit_header 
362share/xymon/web/notify_footer 364share/xymon/web/notify_footer
363share/xymon/web/notify_form 365share/xymon/web/notify_form
364share/xymon/web/notify_header 366share/xymon/web/notify_header
365share/xymon/web/perfdata_footer 367share/xymon/web/perfdata_footer
366share/xymon/web/perfdata_form 368share/xymon/web/perfdata_form
367share/xymon/web/perfdata_header 369share/xymon/web/perfdata_header
368share/xymon/web/replog_footer 370share/xymon/web/replog_footer
369share/xymon/web/replog_header 371share/xymon/web/replog_header
 372share/xymon/web/repnormal_footer
 373share/xymon/web/repnormal_header
370share/xymon/web/report_footer 374share/xymon/web/report_footer
371share/xymon/web/report_form 375share/xymon/web/report_form
372share/xymon/web/report_form_daily 376share/xymon/web/report_form_daily
373share/xymon/web/report_form_monthly 377share/xymon/web/report_form_monthly
374share/xymon/web/report_form_weekly 378share/xymon/web/report_form_weekly
375share/xymon/web/report_header 379share/xymon/web/report_header
 380share/xymon/web/snapcritical_footer
 381share/xymon/web/snapcritical_header
 382share/xymon/web/snapnongreen_footer
 383share/xymon/web/snapnongreen_header
 384share/xymon/web/snapnormal_footer
 385share/xymon/web/snapnormal_header
376share/xymon/web/snapshot_footer 386share/xymon/web/snapshot_footer
377share/xymon/web/snapshot_form 387share/xymon/web/snapshot_form
378share/xymon/web/snapshot_header 388share/xymon/web/snapshot_header
 389share/xymon/web/stdcritical_footer
 390share/xymon/web/stdcritical_header
 391share/xymon/web/stdnongreen_footer
 392share/xymon/web/stdnongreen_header
 393share/xymon/web/stdnormal_footer
 394share/xymon/web/stdnormal_header
379share/xymon/web/topchanges_footer 395share/xymon/web/topchanges_footer
380share/xymon/web/topchanges_form 396share/xymon/web/topchanges_form
381share/xymon/web/topchanges_header 397share/xymon/web/topchanges_header
382share/xymon/web/trends_form 398share/xymon/web/trends_form
383share/xymon/web/useradm_footer 399share/xymon/web/useradm_footer
384share/xymon/web/useradm_form 400share/xymon/web/useradm_form
385share/xymon/web/useradm_header 401share/xymon/web/useradm_header
386share/xymon/web/zoom.js 402share/xymon/web/zoom.js
 403@pkgdir share/xymon/xymonhome
 404@pkgdir etc/xymon
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/distinfo (expand / switch to unified diff)

--- pkgsrc/net/xymon/distinfo 2010/02/14 22:58:57 1.1.1.1
+++ pkgsrc/net/xymon/distinfo 2011/04/22 14:52:18 1.2
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/02/14 22:58:57 spz Exp $ 1$NetBSD: distinfo,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3SHA1 (xymon-4.3.0-beta2.tar.gz) = 484ab668358856c7bbc7ba85bfe2afa7c0fa2f10 3SHA1 (xymon-4.3.2.tar.gz) = 6663470565545d1801d2ff05cab78bc89695a821
4RMD160 (xymon-4.3.0-beta2.tar.gz) = ab8db88d1e2cb7363c8a9b35396094ea921cc5b5 4RMD160 (xymon-4.3.2.tar.gz) = 45b75a7d3b8a57518aa12f12ee36c6de6de96aae
5Size (xymon-4.3.0-beta2.tar.gz) = 2405826 bytes 5Size (xymon-4.3.2.tar.gz) = 2698224 bytes
6SHA1 (patch-aa) = ce534d384fe0936f7ad6e1a2601c0f4cb1fc3346 6SHA1 (patch-aa) = aa0634088b82ad045435321e354d39923c67873e
7SHA1 (patch-ab) = 255892c607845790641924a4febea18a030685cb 7SHA1 (patch-ab) = 9a8edca943211101f387e5a21d638d44a23cf6a7
8SHA1 (patch-ac) = 653f3496ce2a6107f0c5f30d50b8d7ecc947b196 8SHA1 (patch-ac) = c894c809ec4584636bb9705a521a0208dc2dbc05
9SHA1 (patch-ad) = e5a42cbc6537e23a5a44ed343c86e121adadb139 9SHA1 (patch-ad) = 5073ccab556b2b6c787bcc640cd4c8b112f0c97d
10SHA1 (patch-ae) = 8be66af4b877958f2bc64e18494c67a73acd4360 10SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
11SHA1 (patch-af) = a81d3e73ffd6718e20320c6bd59c56ac4616524a 11SHA1 (patch-af) = d486344e3f7fe05f61ea8ec0f811052a56ceb52f
 12SHA1 (patch-ah) = 152d3b993559b349f241e0a2f6419721bfb3c4b3
cvs diff -r1.1 -r1.2 pkgsrc/net/xymon/MESSAGE (expand / switch to unified diff)

--- pkgsrc/net/xymon/MESSAGE 2010/04/14 19:50:48 1.1
+++ pkgsrc/net/xymon/MESSAGE 2011/04/22 14:52:18 1.2
@@ -1,14 +1,19 @@ @@ -1,14 +1,19 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1 2010/04/14 19:50:48 spz Exp $ 2$NetBSD: MESSAGE,v 1.2 2011/04/22 14:52:18 spz Exp $
3 3
4Please note that the 4Please note that the
5${SECCGIDIR} 5${SECCGIDIR}
6directory has been created with all permissions removed for security 6directory has been created with all permissions removed for security
7reasons. Check what the scripts do and enable those that are useful to you 7reasons. Check what the scripts do and enable those that are useful to you
8and of acceptable security impact. 8and of acceptable security impact.
9 9
10Please also note that anything beyond the xymon front page (eg cpu reports, 10Please also note that anything beyond the xymon front page (eg cpu reports,
11which contain top output) are a privacy concern and also a potential 11which contain top output) are a privacy concern and also a potential
12excessive information disclosure concern, so you may want to restrict 12excessive information disclosure concern, so you may want to restrict
13access to authenticated users. 13access to authenticated users.
 14
 15If you are updating from an earlier version of xymon, many config files
 16and the directory names have changed. Refer to
 17${EXAMPLEDIR}/www/help/upgrade-to-430.txt
 18for the necessary changes.
14=========================================================================== 19===========================================================================
cvs diff -r1.7 -r1.8 pkgsrc/net/xymon/Makefile (expand / switch to unified diff)

--- pkgsrc/net/xymon/Makefile 2011/04/22 13:44:30 1.7
+++ pkgsrc/net/xymon/Makefile 2011/04/22 14:52:18 1.8
@@ -1,194 +1,208 @@ @@ -1,194 +1,208 @@
1# $NetBSD: Makefile,v 1.7 2011/04/22 13:44:30 obache Exp $ 1# $NetBSD: Makefile,v 1.8 2011/04/22 14:52:18 spz Exp $
2# 2#
3 3
4DISTNAME= xymon-4.3.0-beta2 4DISTNAME= xymon-4.3.2
5PKGNAME= xymon-4.3.0b2 5PKGNAME= xymon-4.3.2
6PKGREVISION= 4 
7CATEGORIES= net 6CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
9 8
10MAINTAINER= spz@NetBSD.org 9MAINTAINER= spz@NetBSD.org
11HOMEPAGE= http://hobbitmon.sourceforge.net/ 10HOMEPAGE= http://sourceforge.net/projects/xymon/
12COMMENT= Network services monitor a la Big Brother 11COMMENT= Network services monitor a la Big Brother
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16MAKE_JOBS_SAFE= NO 15MAKE_JOBS_SAFE= NO
17 16
18CONFLICTS+= hobbitmon-[0-9]* 17CONFLICTS+= hobbitmon-[0-9]*
19CONFLICTS+= hobbitclient-[0-9]* 18CONFLICTS+= hobbitclient-[0-9]*
20 19
21DEPENDS+= fping>2:../../net/fping 20DEPENDS+= fping>2:../../net/fping
22 # xymonclient ought to be the same version as the server, modulo nbN 21 # xymonclient ought to be the same version as the server, modulo nbN
23DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient 22DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient
24 23
25HAS_CONFIGURE= YES 24HAS_CONFIGURE= YES
26USE_TOOLS+= gmake 25USE_TOOLS+= gmake
27 26
28.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
29 28
30# xymons user/group 29# xymons user/group
31 30
32BBUSER?= xymon 31XYMONUSER?= xymon
33BBGROUP?= xymon 32XYMONGROUP?= xymon
34 33
35PKG_GROUPS= ${BBGROUP} 34PKG_GROUPS= ${XYMONGROUP}
36PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q} 35PKG_USERS= ${XYMONUSER:Q}:${XYMONGROUP:Q}
37 36
38PKG_GECOS.${BBUSER}= Xymon monitor 37PKG_GECOS.${XYMONUSER}= Xymon monitor
39PKG_HOME.${BBUSER}= ${BBHOME} 38PKG_HOME.${XYMONUSER}= ${XYMONHOME}
40 39
41PKG_GROUPS_VARS+= BBGROUP 40PKG_GROUPS_VARS+= XYMONGROUP
42PKG_GROUPS_VARS+= APACHE_GROUP 41PKG_GROUPS_VARS+= APACHE_GROUP
43PKG_USERS_VARS+= BBUSER 42PKG_USERS_VARS+= XYMONUSER
44 43
45# startup and config 44# startup and config
46 45
47RCD_SCRIPTS+= xymon 46RCD_SCRIPTS+= xymon
48PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon 47PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon
49EXAMPLEDIR= ${PREFIX}/share/examples/xymon 48EXAMPLEDIR= ${PREFIX}/share/examples/xymon
50 49
51INSTALLATION_DIRS+= ${EXAMPLEDIR} 50INSTALLATION_DIRS+= ${EXAMPLEDIR}
52INSTALLATION_DIRS+= ${PKG_SYSCONFDIR.xymon} 51INSTALLATION_DIRS+= ${PKG_SYSCONFDIR.xymon}
53 52
54BBHOME?= ${PREFIX}/share/xymon/bbhome 53XYMONHOME?= ${PREFIX}/share/xymon/xymonhome
55BBTOPDIR?= ${PREFIX}/libexec/xymon 54XYMONTOPDIR?= ${PREFIX}/libexec/xymon
56BBHOSTURL?= / 55XYMONHOSTURL?= /
57CGIDIR?= ${BBTOPDIR}/cgi-bin 56CGIDIR?= ${XYMONTOPDIR}/cgi-bin
58BBCGIURL?= /cgi-bin 57XYMONCGIURL?= /cgi-bin
59SECCGIDIR?= ${BBTOPDIR}/cgi-secure 58SECCGIDIR?= ${XYMONTOPDIR}/cgi-secure
60SECUREBBCGIURL?= /xymon-seccgi 59SECUREXYMONCGIURL?= /xymon-seccgi
61 60
62BBSERVERNAME?= "`uname -n`" 61XYMONSERVERNAME?= "`uname -n`"
63BBSERVERIP?= 127.0.0.1 62XYMONSERVERIP?= 127.0.0.1
64 63
65BBLOGDIR?= ${VARBASE}/log/xymon 64XYMONLOGDIR?= ${VARBASE}/log/xymon
66BBVAR?= ${VARBASE}/xymon 65XYMONVAR?= ${VARBASE}/xymon
67 66
68XYBINDIR?= ${BBTOPDIR} 67XYBINDIR?= ${XYMONTOPDIR}
69XYETCDIR?= ${PKG_SYSCONFDIR.xymon} 68XYETCDIR?= ${PKG_SYSCONFDIR.xymon}
70XYEXTDIR?= ${BBTOPDIR}/ext 69XYEXTDIR?= ${XYMONTOPDIR}/ext
71XYTMPDIR?= ${VARBASE}/xymon/tmp 70XYTMPDIR?= ${VARBASE}/xymon/tmp
72XYWEBDIR?= ${PREFIX}/share/xymon/web 71XYWEBDIR?= ${PREFIX}/share/xymon/web
73XYWWWDIR?= ${VARBASE}/xymon/www 72XYWWWDIR?= ${VARBASE}/xymon/www
74 73
75BUILD_DEFS+= VARBASE 74BUILD_DEFS+= VARBASE
76BUILD_DEFS+= BBHOSTURL 75BUILD_DEFS+= XYMONHOSTURL
77BUILD_DEFS+= BBSERVERNAME 76BUILD_DEFS+= XYMONSERVERNAME
78BUILD_DEFS+= BBSERVERIP 77BUILD_DEFS+= XYMONSERVERIP
79 78
80FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 79FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
81FILES_SUBST+= BBHOME=${BBHOME:Q} 80FILES_SUBST+= XYMONHOME=${XYMONHOME:Q}
82FILES_SUBST+= BBLOGDIR=${BBLOGDIR} 81FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR}
83FILES_SUBST+= BBVAR=${BBVAR:Q} 82FILES_SUBST+= XYMONVAR=${XYMONVAR:Q}
84FILES_SUBST+= XYBINDIR=${XYBINDIR} 83FILES_SUBST+= XYBINDIR=${XYBINDIR}
85FILES_SUBST+= XYETCDIR=${XYETCDIR} 84FILES_SUBST+= XYETCDIR=${XYETCDIR}
86FILES_SUBST+= XYEXTDIR=${XYEXTDIR} 85FILES_SUBST+= XYEXTDIR=${XYEXTDIR}
87FILES_SUBST+= XYTMPDIR=${XYTMPDIR} 86FILES_SUBST+= XYTMPDIR=${XYTMPDIR}
88FILES_SUBST+= XYWEBDIR=${XYWEBDIR} 87FILES_SUBST+= XYWEBDIR=${XYWEBDIR}
89FILES_SUBST+= XYWWWDIR=${XYWWWDIR} 88FILES_SUBST+= XYWWWDIR=${XYWWWDIR}
90 89
 90MESSAGE_SUBST+= DESTDIR=${DESTDIR}
 91MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
91MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR} 92MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR}
92 93
93EVAL_PREFIX+= PREFIX.fping=fping 94EVAL_PREFIX+= PREFIX.fping=fping
94 95
95CONFIGURE_ARGS+= "--server" 96CONFIGURE_ARGS+= "--server"
96 97
97CONFIGURE_ENV+= USERFPING=${PREFIX.fping}/sbin/fping 98CONFIGURE_ENV+= USERFPING=${PREFIX.fping}/sbin/fping
98CONFIGURE_ENV+= USEHOBBITPING=n 99CONFIGURE_ENV+= USEXYMONPING=n
99CONFIGURE_ENV+= RRDINC=${BUILDLINK_PREFIX.rrdtool}/include 100CONFIGURE_ENV+= RRDINC=${BUILDLINK_PREFIX.rrdtool}/include
100CONFIGURE_ENV+= RRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a 101CONFIGURE_ENV+= RRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a
101CONFIGURE_ENV+= PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a 102CONFIGURE_ENV+= PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a
102CONFIGURE_ENV+= ENABLESSL=y 103CONFIGURE_ENV+= ENABLESSL=y
103CONFIGURE_ENV+= OSSLINC=${BUILDLINK_PREFIX.openssl}/include 104CONFIGURE_ENV+= OSSLINC=${BUILDLINK_PREFIX.openssl}/include
104CONFIGURE_ENV+= OSSLLIB=${BUILDLINK_PREFIX.openssl}/lib 105CONFIGURE_ENV+= OSSLLIB=${BUILDLINK_PREFIX.openssl}/lib
105CONFIGURE_ENV+= ENABLELDAP=y 106CONFIGURE_ENV+= ENABLELDAP=y
106CONFIGURE_ENV+= ENABLELDAPSSL=y 107CONFIGURE_ENV+= ENABLELDAPSSL=y
107CONFIGURE_ENV+= LDAPINC=${BUILDLINK_PREFIX.openldap-client}/include 108CONFIGURE_ENV+= LDAPINC=${BUILDLINK_PREFIX.openldap-client}/include
108CONFIGURE_ENV+= LDAPLIB=${BUILDLINK_PREFIX.openldap-client}/lib 109CONFIGURE_ENV+= LDAPLIB=${BUILDLINK_PREFIX.openldap-client}/lib
109CONFIGURE_ENV+= PCREINC=${BUILDLINK_PREFIX.pcre}/include 110CONFIGURE_ENV+= PCREINC=${BUILDLINK_PREFIX.pcre}/include
110CONFIGURE_ENV+= PCRELIB=${BUILDLINK_PREFIX.pcre}/lib 111CONFIGURE_ENV+= PCRELIB=${BUILDLINK_PREFIX.pcre}/lib
111CONFIGURE_ENV+= BBHOSTNAME=${BBSERVERNAME:Q} 112CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q}
112CONFIGURE_ENV+= BBHOSTIP=${BBSERVERIP:Q} 113CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q}
113CONFIGURE_ENV+= BBUSER=${BBUSER:Q} 114CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q}
114CONFIGURE_ENV+= BBHOME=${BBHOME:Q} 115CONFIGURE_ENV+= XYMONHOME=${XYMONHOME:Q}
115CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR} 116CONFIGURE_ENV+= XYMONTOPDIR=${XYMONTOPDIR}
116CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL:Q} 117CONFIGURE_ENV+= XYMONHOSTURL=${XYMONHOSTURL:Q}
117CONFIGURE_ENV+= CGIDIR=${CGIDIR} 118CONFIGURE_ENV+= CGIDIR=${CGIDIR}
118CONFIGURE_ENV+= BBCGIURL=${BBCGIURL:Q} 119CONFIGURE_ENV+= XYMONCGIURL=${XYMONCGIURL:Q}
119CONFIGURE_ENV+= SECURECGIDIR=${SECCGIDIR} 120CONFIGURE_ENV+= SECURECGIDIR=${SECCGIDIR}
120CONFIGURE_ENV+= SECUREBBCGIURL=${SECUREBBCGIURL:Q} 121CONFIGURE_ENV+= SECUREXYMONCGIURL=${SECUREXYMONCGIURL:Q}
121CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP} 122CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP}
122CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR} 123CONFIGURE_ENV+= XYMONLOGDIR=${XYMONLOGDIR}
123CONFIGURE_ENV+= BBVAR=${BBVAR:Q} 124CONFIGURE_ENV+= XYMONVAR=${XYMONVAR:Q}
124CONFIGURE_ENV+= INSTALLROOT=${DESTDIR} 125CONFIGURE_ENV+= INSTALLROOT=${DESTDIR}
125CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR} 126CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR}
126CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR} 127CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR}
127CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR} 128CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR}
128CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR} 129CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR}
129CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR} 130CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR}
130CONFIGURE_ENV+= INSTALLWEBDIR=${XYWEBDIR} 131CONFIGURE_ENV+= INSTALLWEBDIR=${XYWEBDIR}
131CONFIGURE_ENV+= INSTALLWWWDIR=${XYWWWDIR} 132CONFIGURE_ENV+= INSTALLWWWDIR=${XYWWWDIR}
132CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/ 133CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/
133 134
134SUBST_CLASSES+= bashpath 135SUBST_CLASSES+= bashpath
135SUBST_FILES.bashpath= hobbitd/hobbitreports.sh.DIST 136SUBST_FILES.bashpath= xymond/xymonreports.sh.DIST
136SUBST_SED.bashpath= -e 's,/bin/bash,'${BASH:Q}',' 137SUBST_SED.bashpath= -e 's,/bin/bash,'${BASH:Q}','
137SUBST_STAGE.bashpath= post-patch 138SUBST_STAGE.bashpath= post-patch
138 139
139USE_TOOLS+= awk:run cat:run cp:run 140USE_TOOLS+= awk:run cat:run cp:run
140USE_TOOLS+= cut:run date:run egrep:run 141USE_TOOLS+= cut:run date:run egrep:run
141USE_TOOLS+= expr:run find:run grep:run 142USE_TOOLS+= expr:run find:run grep:run
142USE_TOOLS+= head:run id:run ls:run 143USE_TOOLS+= head:run id:run ls:run
143USE_TOOLS+= mv:run rm:run sed:run 144USE_TOOLS+= mv:run rm:run sed:run
144USE_TOOLS+= sort:run tail:run touch:run 145USE_TOOLS+= sort:run tail:run touch:run
145USE_TOOLS+= tr:run wc:run bash:run 146USE_TOOLS+= tr:run wc:run bash:run
146 147
147 148
148MAKE_DIRS+= ${BBTOPDIR} 149MAKE_DIRS+= ${XYMONTOPDIR}
149MAKE_DIRS+= ${BBHOME} 150MAKE_DIRS+= ${XYMONHOME}
150 151
151OWN_DIRS_PERMS+= ${XYEXTDIR} ${BBUSER} ${BBGROUP} 0755 152OWN_DIRS_PERMS+= ${XYEXTDIR} ${XYMONUSER} ${XYMONGROUP} 0755
152OWN_DIRS_PERMS+= ${BBLOGDIR} ${BBUSER} ${BBGROUP} 0755 153OWN_DIRS_PERMS+= ${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755
153OWN_DIRS_PERMS+= ${XYTMPDIR} ${BBUSER} ${BBGROUP} 0755 154OWN_DIRS_PERMS+= ${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755
154 155
155OWN_DIRS_PERMS+= ${BBVAR} ${BBUSER} ${BBGROUP} 0755 156OWN_DIRS_PERMS+= ${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755
156VAR_SUBDIRS= acks data disabled download hist histlogs hostdata rrd 157VAR_SUBDIRS= acks data disabled download hist histlogs hostdata rrd
157.for dir in ${VAR_SUBDIRS} 158.for dir in ${VAR_SUBDIRS}
158OWN_DIRS_PERMS+= ${BBVAR}/${dir} ${BBUSER} ${BBGROUP} 0755 159OWN_DIRS_PERMS+= ${XYMONVAR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755
159.endfor 160.endfor
160 161
161OWN_DIRS_PERMS+= ${XYWWWDIR} ${BBUSER} ${BBGROUP} 0755 162OWN_DIRS_PERMS+= ${XYWWWDIR} ${XYMONUSER} ${XYMONGROUP} 0755
162WWW_SUBDIRS= gifs help html menu notes wml 163WWW_SUBDIRS= gifs help html menu notes wml
163.for dir in ${WWW_SUBDIRS} 164.for dir in ${WWW_SUBDIRS}
164OWN_DIRS_PERMS+= ${XYWWWDIR}/${dir} ${BBUSER} ${BBGROUP} 0755 165OWN_DIRS_PERMS+= ${XYWWWDIR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755
165.endfor 166.endfor
166OWN_DIRS_PERMS+= ${XYWWWDIR}/rep ${BBUSER} ${APACHE_GROUP} 0755 167OWN_DIRS_PERMS+= ${XYWWWDIR}/rep ${XYMONUSER} ${APACHE_GROUP} 0755
167OWN_DIRS_PERMS+= ${XYWWWDIR}/snap ${BBUSER} ${APACHE_GROUP} 0755 168OWN_DIRS_PERMS+= ${XYWWWDIR}/snap ${XYMONUSER} ${APACHE_GROUP} 0755
168 169
169MAKE_DIRS_PERMS+= ${SECCGIDIR} root ${BBGROUP} 0000 170MAKE_DIRS_PERMS+= ${SECCGIDIR} root ${XYMONGROUP} 0000
170 171
171# actual config files 172# actual config files
172 173
173CFILES= bb-hosts bb-services bbcombotest.cfg client-local.cfg 174CFILES= alerts.cfg analysis.cfg cgioptions.cfg client-local.cfg
174CFILES+= columndoc.csv hobbit-alerts.cfg hobbit-apache.conf 175CFILES+= columndoc.csv columndoc.csv combo.cfg
175CFILES+= hobbit-clients.cfg hobbit-nkview.cfg hobbitcgi.cfg 176CFILES+= graphs.cfg holidays.cfg hosts.cfg protocols.cfg
176CFILES+= hobbitgraph.cfg hobbitlaunch.cfg hobbitserver.cfg 177CFILES+= rrddefinitions.cfg snmpmibs.cfg tasks.cfg
 178CFILES+= xymon-apache.conf xymonmenu.cfg xymonserver.cfg
177.for file in ${CFILES} 179.for file in ${CFILES}
178CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${BBUSER} ${BBGROUP} 0644 180CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644
 181.endfor
 182
 183CFILES2= critical.cfg critical.cfg.bak
 184.for file in ${CFILES2}
 185CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0664
179.endfor 186.endfor
180 187
181MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} 188MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
182MAKE_ENV+= PKGDIR=${PREFIX} 189MAKE_ENV+= PKGDIR=${PREFIX}
183MAKE_ENV+= INSTALLROOT=${DESTDIR} 190MAKE_ENV+= INSTALLROOT=${DESTDIR}
184MAKE_ENV+= PKGBUILD=y 191MAKE_ENV+= PKGBUILD=y
185MAKE_ENV+= ${TOOLS_ENV} 192MAKE_ENV+= ${TOOLS_ENV}
186 193
 194MENUFILES= b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif
 195MENUFILES+= xymonmenu-blue.css xymonmenu-grey.css
 196post-install:
 197.for file in ${MENUFILES}
 198 chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/menu/${file}
 199.endfor
 200
187.include "../../databases/rrdtool/buildlink3.mk" 201.include "../../databases/rrdtool/buildlink3.mk"
188.include "../../databases/openldap-client/buildlink3.mk" 202.include "../../databases/openldap-client/buildlink3.mk"
189.include "../../security/openssl/buildlink3.mk" 203.include "../../security/openssl/buildlink3.mk"
190.include "../../graphics/png/buildlink3.mk" 204.include "../../graphics/png/buildlink3.mk"
191.include "../../devel/pcre/buildlink3.mk" 205.include "../../devel/pcre/buildlink3.mk"
192.include "../../mk/apache.mk" 206.include "../../mk/apache.mk"
193 207
194.include "../../mk/bsd.pkg.mk" 208.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-aa 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/patches/patch-aa 2011/04/22 14:52:18 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 1$NetBSD: patch-aa,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3--- configure.server.orig 2009-02-12 13:09:34.000000000 +0000 3--- configure.server.orig 2011-03-08 17:20:28.000000000 +0000
4+++ configure.server 4+++ configure.server
5@@ -495,6 +495,9 @@ fi 5@@ -507,6 +507,9 @@ fi
6 if test "$INSTALLETCDIR" != ""; then 6 if test "$INSTALLETCDIR" != ""; then
7 echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile 7 echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile
8 fi 8 fi
9+if test "$INSTALLEXADIR" != ""; then 9+if test "$INSTALLEXADIR" != ""; then
10+ echo "INSTALLEXADIR = $INSTALLEXADIR" >>Makefile 10+ echo "INSTALLEXADIR = $INSTALLEXADIR" >>Makefile
11+fi 11+fi
12 if test "$INSTALLEXTDIR" != ""; then 12 if test "$INSTALLEXTDIR" != ""; then
13 echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile 13 echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile
14 fi 14 fi
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ab 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/patches/patch-ab 2011/04/22 14:52:18 1.2
@@ -1,157 +1,159 @@ @@ -1,157 +1,159 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 1$NetBSD: patch-ab,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3--- build/Makefile.rules.orig 2009-02-12 13:00:50.000000000 +0000 3--- build/Makefile.rules.orig 2011-03-08 17:20:28.000000000 +0000
4+++ build/Makefile.rules 4+++ build/Makefile.rules
5@@ -22,9 +22,9 @@ else 5@@ -22,9 +22,9 @@ else
6 INSTALLTARGETS = install-client install-clientmsg 6 INSTALLTARGETS = install-client install-clientmsg
7 endif 7 endif
8 else 8 else
9- BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build client 9- BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client
10- CLIENTTARGETS = lib-client common-client build-build 10- CLIENTTARGETS = lib-client common-client build-build
11- INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-client install-servermsg 11- INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg
12+ BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build # client 12+ BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build # client
13+ CLIENTTARGETS = # lib-client common-client build-build 13+ CLIENTTARGETS = # lib-client common-client build-build
14+ INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-servermsg # install-client 14+ INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg # install-client
15 CFLAGS += $(PCREINCDIR) 15 CFLAGS += $(PCREINCDIR)
16 endif 16 endif
17  17
18@@ -34,6 +34,9 @@ endif 18@@ -34,6 +34,9 @@ endif
19 ifndef INSTALLETCDIR 19 ifndef INSTALLETCDIR
20 INSTALLETCDIR = $(BBHOME)/etc 20 INSTALLETCDIR = $(XYMONHOME)/etc
21 endif 21 endif
22+ifndef INSTALLEXADIR 22+ifndef INSTALLEXADIR
23+INSTALLEXADIR = $(BBHOME)/etc 23+INSTALLEXADIR = $(XYMONHOME)/etc
24+endif 24+endif
25 ifndef INSTALLEXTDIR 25 ifndef INSTALLEXTDIR
26 INSTALLEXTDIR = $(BBHOME)/ext 26 INSTALLEXTDIR = $(XYMONHOME)/ext
27 endif 27 endif
28@@ -156,58 +159,67 @@ install-servermsg: 28@@ -167,72 +170,77 @@ install-servermsg:
29 @echo "To view the Hobbit webpages, go to http://${BBHOSTNAME}${BBHOSTURL}" 29 @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}"
30  30
31 install-dirs: 31 install-dirs:
32- mkdir -p $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(BBHOME)/download $(INSTALLROOT)$(BBVAR) 32- mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR)
33+ mkdir -p $(INSTALLROOT)$(BBHOME) $(INSTALLROOT)$(BBVAR) 33+ mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR)
34+ 34+ mkdir -p $(INSTALLROOT)$(XYMONVAR)/download
35+ mkdir -p $(INSTALLROOT)$(BBVAR)/download 
36+ifndef PKGBUILD 
37+ifneq ($(BBVAR),$(BBHOME)) 
38+ ln -sf $(BBVAR)/download $(INSTALLROOT)$(BBHOME)/download 
39+endif 
40+endif 
41  35
42 mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) 36 mkdir -p $(INSTALLROOT)$(INSTALLBINDIR)
43+ifndef PKGBUILD 37+ifndef PKGBUILD
44 ifneq ($(INSTALLBINDIR),$(BBHOME)/bin) 38 ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin)
45 ln -sf $(INSTALLBINDIR) $(INSTALLROOT)$(BBHOME)/bin 39 rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true
 40 ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true
46 endif 41 endif
47-ifndef PKGBUILD 42-ifndef PKGBUILD
48 chown $(BBUSER) $(INSTALLROOT)$(INSTALLBINDIR) 43 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLBINDIR)
49 chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLBINDIR) 44 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLBINDIR)
50 endif 45 endif
51  46
52 mkdir -p $(INSTALLROOT)$(INSTALLETCDIR) 47 mkdir -p $(INSTALLROOT)$(INSTALLETCDIR)
53+ifndef PKGBUILD 48+ifndef PKGBUILD
54 ifneq ($(INSTALLETCDIR),$(BBHOME)/etc) 49 ifneq ($(INSTALLETCDIR),$(XYMONHOME)/etc)
55 ln -sf $(INSTALLETCDIR) $(INSTALLROOT)$(BBHOME)/etc 50 rm -f $(INSTALLROOT)$(XYMONHOME)/etc || true
 51 ln -s $(INSTALLETCDIR) $(INSTALLROOT)$(XYMONHOME)/etc || true
56 endif 52 endif
57-ifndef PKGBUILD 53-ifndef PKGBUILD
58 chown $(BBUSER) $(INSTALLROOT)$(INSTALLETCDIR) 54 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLETCDIR)
59 chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLETCDIR) 55 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLETCDIR)
60 endif 56 endif
61  57
62+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR) 58+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)
63+ 59+
64 mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR) 60 mkdir -p $(INSTALLROOT)$(INSTALLEXTDIR)
65+ifndef PKGBUILD 61+ifndef PKGBUILD
66 ifneq ($(INSTALLEXTDIR),$(BBHOME)/ext) 62 ifneq ($(INSTALLEXTDIR),$(XYMONHOME)/ext)
67 ln -sf $(INSTALLEXTDIR) $(INSTALLROOT)$(BBHOME)/ext 63 rm -f $(INSTALLROOT)$(XYMONHOME)/ext || true
 64 ln -s $(INSTALLEXTDIR) $(INSTALLROOT)$(XYMONHOME)/ext || true
68 endif 65 endif
69-ifndef PKGBUILD 66-ifndef PKGBUILD
70 chown $(BBUSER) $(INSTALLROOT)$(INSTALLEXTDIR) 67 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLEXTDIR)
71 chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLEXTDIR) 68 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLEXTDIR)
72 endif 69 endif
73  70
74 mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR) 71 mkdir -p $(INSTALLROOT)$(INSTALLTMPDIR)
75+ifndef PKGBUILD 72+ifndef PKGBUILD
76 ifneq ($(INSTALLTMPDIR),$(BBHOME)/tmp) 73 ifneq ($(INSTALLTMPDIR),$(XYMONHOME)/tmp)
77 ln -sf $(INSTALLTMPDIR) $(INSTALLROOT)$(BBHOME)/tmp 74 rm -f $(INSTALLROOT)$(XYMONHOME)/tmp || true
 75 ln -s $(INSTALLTMPDIR) $(INSTALLROOT)$(XYMONHOME)/tmp || true
78 endif 76 endif
79-ifndef PKGBUILD 77-ifndef PKGBUILD
80 chown $(BBUSER) $(INSTALLROOT)$(INSTALLTMPDIR) 78 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLTMPDIR)
81 chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLTMPDIR) 79 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLTMPDIR)
82 endif 80 endif
83  81
84 mkdir -p $(INSTALLROOT)$(INSTALLWEBDIR) 82 mkdir -p $(INSTALLROOT)$(INSTALLWEBDIR)
85+ifndef PKGBUILD 83+ifndef PKGBUILD
86 ifneq ($(INSTALLWEBDIR),$(BBHOME)/web) 84 ifneq ($(INSTALLWEBDIR),$(XYMONHOME)/web)
87 ln -sf $(INSTALLWEBDIR) $(INSTALLROOT)$(BBHOME)/web 85 rm -f $(INSTALLROOT)$(XYMONHOME)/web || true
 86 ln -s $(INSTALLWEBDIR) $(INSTALLROOT)$(XYMONHOME)/web || true
88 endif 87 endif
89-ifndef PKGBUILD 88-ifndef PKGBUILD
90 chown $(BBUSER) $(INSTALLROOT)$(INSTALLWEBDIR) 89 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWEBDIR)
91 chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLWEBDIR) 90 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWEBDIR)
92 endif 91 endif
93  92
94 mkdir -p $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 93 mkdir -p $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
95+ifndef PKGBUILD 94+ifndef PKGBUILD
96 ifneq ($(INSTALLWWWDIR),$(BBHOME)/www) 95 ifneq ($(INSTALLWWWDIR),$(XYMONHOME)/www)
97 ln -sf $(INSTALLWWWDIR) $(INSTALLROOT)$(BBHOME)/www 96 rm -f $(INSTALLROOT)$(XYMONHOME)/www || true
 97 ln -s $(INSTALLWWWDIR) $(INSTALLROOT)$(XYMONHOME)/www || true
98 endif 98 endif
99-ifndef PKGBUILD 99-ifndef PKGBUILD
100 chown $(BBUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 100 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
101 chgrp `$(IDTOOL) -g $(BBUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 101 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
102 ifdef HTTPDGID 102 ifdef HTTPDGID
103@@ -215,6 +227,8 @@ ifdef HTTPDGID 103 # The www/rep and www/snap directories must be writable by the apache daemon
104 chgrp $(HTTPDGID) $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap 104 chgrp $(HTTPDGID) $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap
105 endif 105-endif
106 chmod g+w $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap 106 chmod g+w $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap
107+else 
108+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)/www $(INSTALLROOT)$(INSTALLEXADIR)/www/gifs $(INSTALLROOT)$(INSTALLEXADIR)/www/help $(INSTALLROOT)$(INSTALLEXADIR)/www/menu  
109 endif 107 endif
 108+else
 109+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)/www $(INSTALLROOT)$(INSTALLEXADIR)/www/gifs $(INSTALLROOT)$(INSTALLEXADIR)/www/help $(INSTALLROOT)$(INSTALLEXADIR)/www/menu
 110+endif
110  111
111 mkdir -p $(INSTALLROOT)$(BBVAR)/acks 112 mkdir -p $(INSTALLROOT)$(XYMONVAR)/acks
112@@ -266,25 +280,25 @@ ifndef PKGBUILD 113 ifndef PKGBUILD
 114@@ -283,25 +291,25 @@ ifndef PKGBUILD
113 endif 115 endif
114  116
115 install-common: install-dirs 117 install-common: install-dirs
116- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install 118- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
117+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install 119+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
118  120
119 install-bbdisplay: install-common 121 install-xymongen: install-common
120- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install 122- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
121+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install 123+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
122  124
123 install-bbdisplay-nocgi: install-common 125 install-xymongen-nocgi: install-common
124- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install-nocgi 126- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
125+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbdisplay install-nocgi 127+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
126  128
127 install-bbnet: install-common 129 install-xymonnet: install-common
128- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C bbnet install 130- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
129+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C bbnet install 131+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
130  132
131 install-bbproxy: install-common 133 install-xymonproxy: install-common
132- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbproxy install 134- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
133+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C bbproxy install 135+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
134  136
135 install-hobbitd: install-common 137 install-xymond: install-common
136- MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C hobbitd install 138- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
137+ MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C hobbitd install 139+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
138  140
139 install-web: install-common 141 install-web: install-common
140- MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install 142- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
141+ MANROOT="$(MANROOT)" BBTOPDIR="$(BBTOPDIR)" BBHOME="$(BBHOME)" BBVAR="$(BBVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" BBLOGDIR="$(BBLOGDIR)" BBUSER="$(BBUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install 143+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
142  144
143  145
144 # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install" 146 # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install"
145@@ -297,10 +311,10 @@ install-man: 147@@ -314,10 +322,10 @@ install-man:
146 BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man 148 XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man
147  149
148 install-docs: 150 install-docs:
149- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install 151- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
150+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" $(MAKE) -C docs install 152+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" $(MAKE) -C docs install
151  153
152 install-custom: 154 install-custom:
153- BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" 155- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
154+ BBHOME="$(BBHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" 156+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
155  157
156  158
157 client-install: install-client 159 client-install: install-client
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ac 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/patches/patch-ac 2011/04/22 14:52:18 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 1$NetBSD: patch-ac,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3--- hobbitd/Makefile.orig 2009-02-12 13:09:34.000000000 +0000 3--- xymond/Makefile.orig 2011-03-08 17:20:28.000000000 +0000
4+++ hobbitd/Makefile 4+++ xymond/Makefile
5@@ -159,7 +159,9 @@ install-cfg: 5@@ -157,7 +157,9 @@ install-cfg:
6 cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv 6 cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv
7 cd etcfiles; (echo "bb-hosts"; echo "hobbit-alerts.cfg"; echo "hobbit-clients.cfg"; echo "bbcombotest.cfg"; echo "client-local.cfg") | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ 7 cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/
8 cd etcfiles; cp -fp hobbit-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-apache.conf 8 cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf
9+ifndef PKGBUILD 9+ifndef PKGBUILD
10 cd $(INSTALLROOT)$(BBHOME); rm -f hobbit.sh; ln -sf bin/hobbit.sh . 10 cd $(INSTALLROOT)$(XYMONHOME); rm -f xymon.sh; ln -sf bin/xymon.sh .
11+endif 11+endif
12 cd wwwfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat 12 cd wwwfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat
13 cd webfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat 13 cd webfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat
14 touch $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-nkview.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-nkview.cfg.bak 14 touch $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg $(INSTALLROOT)$(INSTALLETCDIR)/critical.cfg.bak
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ad 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/patches/patch-ad 2011/04/22 14:52:18 1.2
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1$NetBSD: patch-ad,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 1$NetBSD: patch-ad,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3--- build/Makefile.NetBSD.orig 2010-02-08 23:58:57.000000000 +0000 3--- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000
4+++ build/Makefile.NetBSD 4+++ build/Makefile.NetBSD
5@@ -10,7 +10,8 @@ NETLIBS = 5@@ -1,7 +1,7 @@
6 CC= gcc 6 # Xymon compile-time settings for NetBSD systems
7 PKGDIR?=/usr/pkg 7 # From Emmanuel Dreyfus.
8 CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \ 8 #
9- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 9-OSDEF = -DBSD
10+ -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib \ 10+OSDEF = -DBSD -DHAVE_STDINT_H
11+ -DHAVE_STDINT_H 
12 RPATH = "-Wl,--rpath," 
13  11
14 # Compile flags for debugging 12 # NETLIBS: None needed
 13 NETLIBS =
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ae 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/patches/patch-ae 2011/04/22 14:52:18 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-ae,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 1$NetBSD: patch-ae,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3--- build/bb-commands.sh.orig 2007-04-14 00:20:21.000000000 -0500 3--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000
4+++ build/bb-commands.sh 4+++ build/bb-commands.sh
5@@ -9,6 +9,11 @@ 5@@ -9,6 +9,11 @@
6  6
7 findbin() { 7 findbin() {
8 MYP="`echo ${PATH} | sed -e 's/:/ /g'`" 8 MYP="`echo ${PATH} | sed -e 's/:/ /g'`"
9+ eval _var=\"\${${ENVNAME}}\" 9+ eval _var=\"\${${ENVNAME}}\"
10+ if test -n "$_var"; then 10+ if test -n "$_var"; then
11+ echo "$_var" 11+ echo "$_var"
12+ return 12+ return
13+ fi 13+ fi
14  14
15 for D in $MYP 15 for D in $MYP
16 do 16 do
17@@ -31,11 +36,13 @@ do 17@@ -31,11 +36,13 @@ do
18 done 18 done
19  19
20 # WC is special 20 # WC is special
21+ENVNAME=WC 21+ENVNAME=WC
22 PGM=`findbin wc | head -n 1` 22 PGM=`findbin wc | head -n 1`
23 echo "WC=\"${PGM} -l\"" 23 echo "WC=\"${PGM} -l\""
24 echo "WCC=\"${PGM}\"" 24 echo "WCC=\"${PGM}\""
25  25
26 # DFCMD is an alias for DF 26 # DFCMD is an alias for DF
27+ENVNAME=DF 27+ENVNAME=DF
28 PGM=`findbin df | head -n 1` 28 PGM=`findbin df | head -n 1`
29 echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Hobbit client" 29 echo "# DF,DFCMD and PS are for compatibility only, NOT USED by the Xymon client"
30 echo "DF=\"${PGM} -Pk\"" 30 echo "DF=\"${PGM} -Pk\""
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymon/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-af 2010/02/14 22:58:58 1.1.1.1
+++ pkgsrc/net/xymon/patches/patch-af 2011/04/22 14:52:18 1.2
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
1$NetBSD: patch-af,v 1.1.1.1 2010/02/14 22:58:58 spz Exp $ 1$NetBSD: patch-af,v 1.2 2011/04/22 14:52:18 spz Exp $
2 2
3--- ./hobbitd/etcfiles/hobbitlaunch.cfg.DIST.orig 2008-11-27 13:12:12.000000000 +0000 3--- xymond/etcfiles/tasks.cfg.DIST.orig 2011-03-08 17:20:28.000000000 +0000
4+++ ./hobbitd/etcfiles/hobbitlaunch.cfg.DIST 4+++ xymond/etcfiles/tasks.cfg.DIST
5@@ -198,7 +198,8 @@ 5@@ -180,6 +180,7 @@
6 # Note: If you are using another client package, you should disable this one. 6 # Xymon server ?), but there's no need to have two xymonlaunch instances
7  7 # running at the same time. So we'll just run it from here.
8 [hobbitclient] 8 [xymonclient]
9- ENVFILE @BBTOPDIR@/client/etc/hobbitclient.cfg 
10+ DISABLED 9+ DISABLED
11+ ENVFILE @BBHOME@/client/etc/hobbitclient.cfg 10 ENVFILE @XYMONTOPDIR@/client/etc/xymonclient.cfg
12 NEEDS hobbitd 11 NEEDS xymond
13 CMD @BBTOPDIR@/client/bin/hobbitclient.sh 12 CMD @XYMONTOPDIR@/client/bin/xymonclient.sh
14 LOGFILE $BBSERVERLOGS/hobbitclient.log 
File Added: pkgsrc/net/xymon/patches/patch-ah
$NetBSD: patch-ah,v 1.1 2011/04/22 14:52:18 spz Exp $

--- xymonnet/Makefile.orig	2011-03-08 17:20:28.000000000 +0000
+++ xymonnet/Makefile
@@ -59,6 +59,8 @@ c-ares/configure: c-ares-$(ARESVER).tar.
 	mv c-ares-$(ARESVER) c-ares
 	# Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file.
 	touch c-ares/configure
+	mkdir c-ares/.libs
+	touch c-ares/.libs/libcares.la
 
 beastat: $(BEASTATOBJS) ../lib/libxymon.a
 	$(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) ../lib/libxymon.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF)