Mon Aug 22 15:22:14 2022 UTC ()
xymon: fix dependency pattern for xymonclient + pkglint


(tnn)
diff -r1.2 -r1.3 pkgsrc/net/xymon/DEINSTALL
diff -r1.67 -r1.68 pkgsrc/net/xymon/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/net/xymon/DEINSTALL (switch to unified diff)

--- pkgsrc/net/xymon/DEINSTALL 2011/04/22 14:52:18 1.2
+++ pkgsrc/net/xymon/DEINSTALL 2022/08/22 15:22:14 1.3
@@ -1,169 +1,168 @@ @@ -1,169 +1,168 @@
1#! /bin/sh 1#! /bin/sh
2# 2#
3# $NetBSD: DEINSTALL,v 1.2 2011/04/22 14:52:18 spz Exp $ 3# $NetBSD: DEINSTALL,v 1.3 2022/08/22 15:22:14 tnn Exp $
4# 4#
5 5
6# xymons user/group 6# xymons user/group
7 7
8EXAMPLEDIR=@EXAMPLEDIR@ 8EXAMPLEDIR=@EXAMPLEDIR@
9XYMONHOME=@XYMONHOME@ 9XYMONHOME=@XYMONHOME@
10XYMONVAR=@XYMONVAR@ 10XYMONVAR=@XYMONVAR@
11XYMONLOGDIR=@XYMONLOGDIR@ 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 xymonbody.css yellow-ack.gif \ 31 unknown.gif xymonbody.css yellow-ack.gif \
32 yellow-recent.gif 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="b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif \ 37 MENUFILES="b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif \
38 xymonmenu-blue.css xymonmenu-grey.css" 38 xymonmenu-blue.css xymonmenu-grey.css"
39 for file in ${MENUFILES}; do 39 for file in ${MENUFILES}; do
40 ${RM} ${XYWWWDIR}/menu/${file} 40 ${RM} ${XYWWWDIR}/menu/${file}
41 done 41 done
42 42
43 DOCFILES="Renaming-430.txt about.html bb-to-xymon.html \ 43 DOCFILES="Renaming-430.txt about.html bb-to-xymon.html \
44 clonewarn.jpg configure.txt \ 44 clonewarn.jpg configure.txt \
45 criticalsystems.html critview-detail-acked.jpg \ 45 criticalsystems.html critview-detail-acked.jpg \
46 critview-detail-ackform.jpg \ 46 critview-detail-ackform.jpg \
47 critview-detail.jpg critview-disk.jpg \ 47 critview-detail.jpg critview-disk.jpg \
48 critview-green.jpg editor-clonemaster.jpg \ 48 critview-green.jpg editor-clonemaster.jpg \
49 editor-diskchanged.jpg editor-disksetup.jpg \ 49 editor-diskchanged.jpg editor-disksetup.jpg \
50 editor-main.jpg editor-makeclone.jpg \ 50 editor-main.jpg editor-makeclone.jpg \
51 editor-nohost.jpg editor-showclone.jpg \ 51 editor-nohost.jpg editor-showclone.jpg \
52 howtograph.html install.html known-issues.html \ 52 howtograph.html install.html known-issues.html \
53 mainview-acked.jpg mainview.jpg \ 53 mainview-acked.jpg mainview.jpg \
54 manpages/index.html \ 54 manpages/index.html \
55 manpages/man1/ackinfo.cgi.1.html \ 55 manpages/man1/ackinfo.cgi.1.html \
56 manpages/man1/acknowledge.cgi.1.html \ 56 manpages/man1/acknowledge.cgi.1.html \
57 manpages/man1/clientupdate.1.html \ 57 manpages/man1/clientupdate.1.html \
58 manpages/man1/combostatus.1.html \ 58 manpages/man1/combostatus.1.html \
59 manpages/man1/confreport.cgi.1.html \ 59 manpages/man1/confreport.cgi.1.html \
60 manpages/man1/criticaleditor.cgi.1.html \ 60 manpages/man1/criticaleditor.cgi.1.html \
61 manpages/man1/criticalview.cgi.1.html \ 61 manpages/man1/criticalview.cgi.1.html \
62 manpages/man1/csvinfo.cgi.1.html \ 62 manpages/man1/csvinfo.cgi.1.html \
63 manpages/man1/datepage.cgi.1.html \ 63 manpages/man1/datepage.cgi.1.html \
64 manpages/man1/eventlog.cgi.1.html \ 64 manpages/man1/eventlog.cgi.1.html \
65 manpages/man1/findhost.cgi.1.html \ 65 manpages/man1/findhost.cgi.1.html \
66 manpages/man1/ghostlist.cgi.1.html \ 66 manpages/man1/ghostlist.cgi.1.html \
67 manpages/man1/history.cgi.1.html \ 67 manpages/man1/history.cgi.1.html \
68 manpages/man1/hostgraphs.cgi.1.html \ 68 manpages/man1/hostgraphs.cgi.1.html \
69 manpages/man1/logfetch.1.html \ 69 manpages/man1/logfetch.1.html \
70 manpages/man1/orcaxymon.1.html \ 70 manpages/man1/orcaxymon.1.html \
71 manpages/man1/report.cgi.1.html \ 71 manpages/man1/report.cgi.1.html \
72 manpages/man1/reportlog.cgi.1.html \ 72 manpages/man1/reportlog.cgi.1.html \
73 manpages/man1/showgraph.cgi.1.html \ 73 manpages/man1/showgraph.cgi.1.html \
74 manpages/man1/snapshot.cgi.1.html \ 74 manpages/man1/snapshot.cgi.1.html \
75 manpages/man1/statusreport.cgi.1.html \ 75 manpages/man1/statusreport.cgi.1.html \
76 manpages/man1/svcstatus.cgi.1.html \ 76 manpages/man1/svcstatus.cgi.1.html \
77 manpages/man1/xymon.1.html \ 77 manpages/man1/xymon.1.html \
78 manpages/man1/xymoncfg.1.html \ 78 manpages/man1/xymoncfg.1.html \
79 manpages/man1/xymoncmd.1.html \ 79 manpages/man1/xymoncmd.1.html \
80 manpages/man1/xymondigest.1.html \ 80 manpages/man1/xymondigest.1.html \
81 manpages/man1/xymongen.1.html \ 81 manpages/man1/xymongen.1.html \
82 manpages/man1/xymongrep.1.html \ 82 manpages/man1/xymongrep.1.html \
83 manpages/man1/xymonnet-again.sh.1.html \ 83 manpages/man1/xymonnet-again.sh.1.html \
84 manpages/man1/xymonnet.1.html \ 84 manpages/man1/xymonnet.1.html \
85 manpages/man1/xymonpage.cgi.1.html \ 85 manpages/man1/xymonpage.cgi.1.html \
86 manpages/man1/xymonping.1.html \ 86 manpages/man1/xymonping.1.html \
87 manpages/man5/alerts.cfg.5.html \ 87 manpages/man5/alerts.cfg.5.html \
88 manpages/man5/analysis.cfg.5.html \ 88 manpages/man5/analysis.cfg.5.html \
89 manpages/man5/cgioptions.cfg.5.html \ 89 manpages/man5/cgioptions.cfg.5.html \
90 manpages/man5/client-local.cfg.5.html \ 90 manpages/man5/client-local.cfg.5.html \
91 manpages/man5/clientlaunch.cfg.5.html \ 91 manpages/man5/clientlaunch.cfg.5.html \
92 manpages/man5/combo.cfg.5.html \ 92 manpages/man5/combo.cfg.5.html \
93 manpages/man5/critical.cfg.5.html \ 93 manpages/man5/critical.cfg.5.html \
94 manpages/man5/graphs.cfg.5.html \ 94 manpages/man5/graphs.cfg.5.html \
95 manpages/man5/hosts.cfg.5.html \ 95 manpages/man5/hosts.cfg.5.html \
96 manpages/man5/protocols.cfg.5.html \ 96 manpages/man5/protocols.cfg.5.html \
97 manpages/man5/tasks.cfg.5.html \ 97 manpages/man5/tasks.cfg.5.html \
98 manpages/man5/xymon-xmh.5.html \ 98 manpages/man5/xymon-xmh.5.html \
99 manpages/man5/xymonclient.cfg.5.html \ 99 manpages/man5/xymonclient.cfg.5.html \
100 manpages/man5/xymonserver.cfg.5.html \ 100 manpages/man5/xymonserver.cfg.5.html \
101 manpages/man5/xymonweb.5.html \ 101 manpages/man5/xymonweb.5.html \
102 manpages/man7/xymon.7.html \ 102 manpages/man7/xymon.7.html \
103 manpages/man8/enadis.cgi.8.html \ 103 manpages/man8/enadis.cgi.8.html \
104 manpages/man8/msgcache.8.html \ 104 manpages/man8/msgcache.8.html \
105 manpages/man8/trimhistory.8.html \ 105 manpages/man8/trimhistory.8.html \
106 manpages/man8/xymon-mailack.8.html \ 106 manpages/man8/xymon-mailack.8.html \
107 manpages/man8/xymoncgimsg.cgi.8.html \ 107 manpages/man8/xymoncgimsg.cgi.8.html \
108 manpages/man8/xymond.8.html \ 108 manpages/man8/xymond.8.html \
109 manpages/man8/xymond_alert.8.html \ 109 manpages/man8/xymond_alert.8.html \
110 manpages/man8/xymond_capture.8.html \ 110 manpages/man8/xymond_capture.8.html \
111 manpages/man8/xymond_channel.8.html \ 111 manpages/man8/xymond_channel.8.html \
112 manpages/man8/xymond_client.8.html \ 112 manpages/man8/xymond_client.8.html \
113 manpages/man8/xymond_filestore.8.html \ 113 manpages/man8/xymond_filestore.8.html \
114 manpages/man8/xymond_history.8.html \ 114 manpages/man8/xymond_history.8.html \
115 manpages/man8/xymond_hostdata.8.html \ 115 manpages/man8/xymond_hostdata.8.html \
116 manpages/man8/xymond_rrd.8.html \ 116 manpages/man8/xymond_rrd.8.html \
117 manpages/man8/xymond_sample.8.html \ 117 manpages/man8/xymond_sample.8.html \
118 manpages/man8/xymonfetch.8.html \ 118 manpages/man8/xymonfetch.8.html \
119 manpages/man8/xymonlaunch.8.html \ 119 manpages/man8/xymonlaunch.8.html \
120 manpages/man8/xymonproxy.8.html \ 120 manpages/man8/xymonproxy.8.html \
121 stdview-detail-acked.jpg \ 121 stdview-detail-acked.jpg \
122 upgrade-to-430.txt \ 122 upgrade-to-430.txt \
123 xymon-alerts.html \ 123 xymon-alerts.html \
124 xymon-apacheconf.txt \ 124 xymon-apacheconf.txt \
125 xymon-clients.png \ 125 xymon-clients.png \
126 xymon-config.html \ 126 xymon-config.html \
127 xymon-hosts.png \ 127 xymon-hosts.png \
128 xymon-mrtg.html \ 128 xymon-mrtg.html \
129 xymon-tips.html \ 129 xymon-tips.html \
130 xymonmain.png \ 130 xymonmain.png \
131 xymonprocs.png \ 131 xymonprocs.png \
132 " 132 "
133 DOCDIRS="manpages/man8 manpages/man7 manpages/man5 \ 133 DOCDIRS="manpages/man8 manpages/man7 manpages/man5 \
134 manpages/man1 manpages" 134 manpages/man1 manpages"
135 for file in ${DOCFILES}; do 135 for file in ${DOCFILES}; do
136 ${RM} ${XYWWWDIR}/help/${file} 136 ${RM} ${XYWWWDIR}/help/${file}
137 done 137 done
138 for dir in ${DOCDIRS}; do 138 for dir in ${DOCDIRS}; do
139 ${RMDIR} ${XYWWWDIR}/help/${dir} 139 ${RMDIR} ${XYWWWDIR}/help/${dir}
140 done 140 done
141 141
142 if [ -h ${XYMONHOME}/bin ]; then 142 if [ -h ${XYMONHOME}/bin ]; then
143 ${RM} ${XYMONHOME}/bin 143 ${RM} ${XYMONHOME}/bin
144 fi 144 fi
145 if [ -h ${XYMONHOME}/etc ]; then 145 if [ -h ${XYMONHOME}/etc ]; then
146 ${RM} ${XYMONHOME}/etc 146 ${RM} ${XYMONHOME}/etc
147 fi 147 fi
148 if [ -h ${XYMONHOME}/ext ]; then 148 if [ -h ${XYMONHOME}/ext ]; then
149 ${RM} ${XYMONHOME}/ext 149 ${RM} ${XYMONHOME}/ext
150 fi 150 fi
151 if [ -h ${XYMONHOME}/tmp ]; then 151 if [ -h ${XYMONHOME}/tmp ]; then
152 ${RM} ${XYMONHOME}/tmp 152 ${RM} ${XYMONHOME}/tmp
153 fi 153 fi
154 if [ -h ${XYMONHOME}/web ]; then 154 if [ -h ${XYMONHOME}/web ]; then
155 ${RM} ${XYMONHOME}/web 155 ${RM} ${XYMONHOME}/web
156 fi 156 fi
157 if [ -h ${XYMONHOME}/www ]; then 157 if [ -h ${XYMONHOME}/www ]; then
158 ${RM} ${XYMONHOME}/www 158 ${RM} ${XYMONHOME}/www
159 fi 159 fi
160 if [ -h ${XYMONHOME}/download ]; then 160 if [ -h ${XYMONHOME}/download ]; then
161 ${RM} ${XYMONHOME}/download 161 ${RM} ${XYMONHOME}/download
162 fi 162 fi
163 if [ -h ${XYMONHOME}/logs ]; then 163 if [ -h ${XYMONHOME}/logs ]; then
164 ${RM} ${XYMONHOME}/logs 164 ${RM} ${XYMONHOME}/logs
165 fi 165 fi
166 166
167 ;; 167 ;;
168esac 168esac
169 
cvs diff -r1.67 -r1.68 pkgsrc/net/xymon/Makefile (switch to unified diff)

--- pkgsrc/net/xymon/Makefile 2022/04/18 19:11:55 1.67
+++ pkgsrc/net/xymon/Makefile 2022/08/22 15:22:14 1.68
@@ -1,225 +1,223 @@ @@ -1,225 +1,223 @@
1# $NetBSD: Makefile,v 1.67 2022/04/18 19:11:55 adam Exp $ 1# $NetBSD: Makefile,v 1.68 2022/08/22 15:22:14 tnn Exp $
2# 2#
3 3
4DISTNAME= xymon-4.3.30 4DISTNAME= xymon-4.3.30
5#PKGREVISION= 0 5PKGREVISION= 4
6PKGREVISION= 3 
7CATEGORIES= net 6CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
9 8
10MAINTAINER= spz@NetBSD.org 9MAINTAINER= spz@NetBSD.org
11HOMEPAGE= https://sourceforge.net/projects/xymon/ 10HOMEPAGE= https://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
15MAKE_JOBS_SAFE= NO 14MAKE_JOBS_SAFE= NO
16 15
17CONFLICTS+= hobbitmon-[0-9]* 16CONFLICTS+= hobbitmon-[0-9]*
18CONFLICTS+= hobbitclient-[0-9]* 17CONFLICTS+= hobbitclient-[0-9]*
19 18
20DEPENDS+= fping>=2:../../net/fping 19DEPENDS+= fping>=2:../../net/fping
21 # xymonclient ought to be the same version as the server, modulo nbN 20DEPENDS+= xymonclient-${PKGVERSION_NOREV}{,nb*}:../../net/xymonclient
22DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient 
23 21
24HAS_CONFIGURE= YES 22HAS_CONFIGURE= YES
25USE_TOOLS+= gmake 23USE_TOOLS+= gmake
26 24
27.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
28 26
29# xymons user/group 27# xymons user/group
30 28
31XYMONUSER?= xymon 29XYMONUSER?= xymon
32XYMONGROUP?= xymon 30XYMONGROUP?= xymon
33 31
34PKG_GROUPS= ${XYMONGROUP} 32PKG_GROUPS= ${XYMONGROUP}
35PKG_USERS= ${XYMONUSER:Q}:${XYMONGROUP:Q} 33PKG_USERS= ${XYMONUSER:Q}:${XYMONGROUP:Q}
36 34
37PKG_GECOS.${XYMONUSER}= Xymon monitor 35PKG_GECOS.${XYMONUSER}= Xymon monitor
38PKG_HOME.${XYMONUSER}= ${XYMONHOME} 36PKG_HOME.${XYMONUSER}= ${XYMONHOME}
39 37
40PKG_GROUPS_VARS+= XYMONGROUP 38PKG_GROUPS_VARS+= XYMONGROUP
41PKG_GROUPS_VARS+= APACHE_GROUP 39PKG_GROUPS_VARS+= APACHE_GROUP
42PKG_USERS_VARS+= XYMONUSER 40PKG_USERS_VARS+= XYMONUSER
43 41
44# startup and config 42# startup and config
45 43
46RCD_SCRIPTS+= xymon 44RCD_SCRIPTS+= xymon
47PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon 45PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon
48EXAMPLEDIR= ${PREFIX}/share/examples/xymon 46EXAMPLEDIR= ${PREFIX}/share/examples/xymon
49 47
50INSTALLATION_DIRS+= ${EXAMPLEDIR} 48INSTALLATION_DIRS+= ${EXAMPLEDIR}
51INSTALLATION_DIRS+= ${PKG_SYSCONFDIR.xymon} 49INSTALLATION_DIRS+= ${PKG_SYSCONFDIR.xymon}
52 50
53XYMONHOME?= ${PREFIX}/share/xymon/xymonhome 51XYMONHOME?= ${PREFIX}/share/xymon/xymonhome
54XYMONTOPDIR?= ${PREFIX}/libexec/xymon 52XYMONTOPDIR?= ${PREFIX}/libexec/xymon
55XYMONHOSTURL?= / 53XYMONHOSTURL?= /
56CGIDIR?= ${XYMONTOPDIR}/cgi-bin 54CGIDIR?= ${XYMONTOPDIR}/cgi-bin
57XYMONCGIURL?= /cgi-bin 55XYMONCGIURL?= /cgi-bin
58SECCGIDIR?= ${XYMONTOPDIR}/cgi-secure 56SECCGIDIR?= ${XYMONTOPDIR}/cgi-secure
59SECUREXYMONCGIURL?= /xymon-seccgi 57SECUREXYMONCGIURL?= /xymon-seccgi
60 58
61XYMONSERVERNAME?= "`uname -n`" 59XYMONSERVERNAME?= "`uname -n`"
62XYMONSERVERIP?= 127.0.0.1 60XYMONSERVERIP?= 127.0.0.1
63 61
64XYMONLOGDIR?= ${VARBASE}/log/xymon 62XYMONLOGDIR?= ${VARBASE}/log/xymon
65XYMONVAR?= ${VARBASE}/xymon 63XYMONVAR?= ${VARBASE}/xymon
66 64
67XYBINDIR?= ${XYMONTOPDIR} 65XYBINDIR?= ${XYMONTOPDIR}
68XYETCDIR?= ${PKG_SYSCONFDIR.xymon} 66XYETCDIR?= ${PKG_SYSCONFDIR.xymon}
69XYEXTDIR?= ${XYMONTOPDIR}/ext 67XYEXTDIR?= ${XYMONTOPDIR}/ext
70XYTMPDIR?= ${VARBASE}/xymon/tmp 68XYTMPDIR?= ${VARBASE}/xymon/tmp
71XYWEBDIR?= ${PREFIX}/share/xymon/web 69XYWEBDIR?= ${PREFIX}/share/xymon/web
72XYWWWDIR?= ${VARBASE}/xymon/www 70XYWWWDIR?= ${VARBASE}/xymon/www
73 71
74BUILD_DEFS+= VARBASE 72BUILD_DEFS+= VARBASE
75BUILD_DEFS+= XYMONHOSTURL 73BUILD_DEFS+= XYMONHOSTURL
76BUILD_DEFS+= XYMONSERVERNAME 74BUILD_DEFS+= XYMONSERVERNAME
77BUILD_DEFS+= XYMONSERVERIP 75BUILD_DEFS+= XYMONSERVERIP
78 76
79FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 77FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
80FILES_SUBST+= XYMONHOME=${XYMONHOME:Q} 78FILES_SUBST+= XYMONHOME=${XYMONHOME:Q}
81FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR} 79FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR}
82FILES_SUBST+= XYMONVAR=${XYMONVAR:Q} 80FILES_SUBST+= XYMONVAR=${XYMONVAR:Q}
83FILES_SUBST+= XYBINDIR=${XYBINDIR} 81FILES_SUBST+= XYBINDIR=${XYBINDIR}
84FILES_SUBST+= XYETCDIR=${XYETCDIR} 82FILES_SUBST+= XYETCDIR=${XYETCDIR}
85FILES_SUBST+= XYEXTDIR=${XYEXTDIR} 83FILES_SUBST+= XYEXTDIR=${XYEXTDIR}
86FILES_SUBST+= XYTMPDIR=${XYTMPDIR} 84FILES_SUBST+= XYTMPDIR=${XYTMPDIR}
87FILES_SUBST+= XYWEBDIR=${XYWEBDIR} 85FILES_SUBST+= XYWEBDIR=${XYWEBDIR}
88FILES_SUBST+= XYWWWDIR=${XYWWWDIR} 86FILES_SUBST+= XYWWWDIR=${XYWWWDIR}
89 87
90MESSAGE_SUBST+= DESTDIR=${DESTDIR} 88MESSAGE_SUBST+= DESTDIR=${DESTDIR}
91MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 89MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
92MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR} 90MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR}
93 91
94CONFIGURE_ARGS+= "--server" 92CONFIGURE_ARGS+= "--server"
95CONFIGURE_ARGS+= "--rrdinclude" "${BUILDLINK_PREFIX.rrdtool}/include" 93CONFIGURE_ARGS+= "--rrdinclude" "${BUILDLINK_PREFIX.rrdtool}/include"
96CONFIGURE_ARGS+= "--rrdlib" "${BUILDLINK_PREFIX.rrdtool}/lib" 94CONFIGURE_ARGS+= "--rrdlib" "${BUILDLINK_PREFIX.rrdtool}/lib"
97CONFIGURE_ARGS+= "--pngconfig" "${BUILDLINK_PREFIX.png}/bin/libpng-config" 95CONFIGURE_ARGS+= "--pngconfig" "${BUILDLINK_PREFIX.png}/bin/libpng-config"
98CONFIGURE_ARGS+= "--pcreinclude" "${BUILDLINK_PREFIX.pcre}/include" 96CONFIGURE_ARGS+= "--pcreinclude" "${BUILDLINK_PREFIX.pcre}/include"
99CONFIGURE_ARGS+= "--pcrelib" "${BUILDLINK_PREFIX.pcre}/lib" 97CONFIGURE_ARGS+= "--pcrelib" "${BUILDLINK_PREFIX.pcre}/lib"
100CONFIGURE_ARGS+= "--fping" "${LOCALBASE}/sbin/fping" 98CONFIGURE_ARGS+= "--fping" "${PREFIX}/sbin/fping"
101 99
102CONFIGURE_ENV+= USEXYMONPING=n 100CONFIGURE_ENV+= USEXYMONPING=n
103CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q} 101CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q}
104CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q} 102CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q}
105CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q} 103CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q}
106CONFIGURE_ENV+= XYMONHOME=${XYMONHOME:Q} 104CONFIGURE_ENV+= XYMONHOME=${XYMONHOME:Q}
107CONFIGURE_ENV+= XYMONTOPDIR=${XYMONTOPDIR} 105CONFIGURE_ENV+= XYMONTOPDIR=${XYMONTOPDIR}
108CONFIGURE_ENV+= XYMONHOSTURL=${XYMONHOSTURL:Q} 106CONFIGURE_ENV+= XYMONHOSTURL=${XYMONHOSTURL:Q}
109CONFIGURE_ENV+= CGIDIR=${CGIDIR} 107CONFIGURE_ENV+= CGIDIR=${CGIDIR}
110CONFIGURE_ENV+= XYMONCGIURL=${XYMONCGIURL:Q} 108CONFIGURE_ENV+= XYMONCGIURL=${XYMONCGIURL:Q}
111CONFIGURE_ENV+= SECURECGIDIR=${SECCGIDIR} 109CONFIGURE_ENV+= SECURECGIDIR=${SECCGIDIR}
112CONFIGURE_ENV+= SECUREXYMONCGIURL=${SECUREXYMONCGIURL:Q} 110CONFIGURE_ENV+= SECUREXYMONCGIURL=${SECUREXYMONCGIURL:Q}
113CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP} 111CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP}
114CONFIGURE_ENV+= XYMONLOGDIR=${XYMONLOGDIR} 112CONFIGURE_ENV+= XYMONLOGDIR=${XYMONLOGDIR}
115CONFIGURE_ENV+= XYMONVAR=${XYMONVAR:Q} 113CONFIGURE_ENV+= XYMONVAR=${XYMONVAR:Q}
116CONFIGURE_ENV+= INSTALLROOT=${DESTDIR} 114CONFIGURE_ENV+= INSTALLROOT=${DESTDIR}
117CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR} 115CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR}
118CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR} 116CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR}
119CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR} 117CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR}
120CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR} 118CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR}
121CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR} 119CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR}
122CONFIGURE_ENV+= INSTALLWEBDIR=${XYWEBDIR} 120CONFIGURE_ENV+= INSTALLWEBDIR=${XYWEBDIR}
123CONFIGURE_ENV+= INSTALLWWWDIR=${EXAMPLEDIR}/www 121CONFIGURE_ENV+= INSTALLWWWDIR=${EXAMPLEDIR}/www
124CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/ 122CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/
125 123
126SUBST_CLASSES+= bashpath 124SUBST_CLASSES+= bashpath
127SUBST_FILES.bashpath= xymond/xymonreports.sh.DIST 125SUBST_FILES.bashpath= xymond/xymonreports.sh.DIST
128SUBST_SED.bashpath= -e 's,/bin/bash,'${BASH:Q}',' 126SUBST_SED.bashpath= -e 's,/bin/bash,'${BASH:Q}','
129SUBST_STAGE.bashpath= pre-configure 127SUBST_STAGE.bashpath= pre-configure
130 128
131USE_TOOLS+= awk:run cat:run cp:run 129USE_TOOLS+= awk:run cat:run cp:run
132USE_TOOLS+= cut:run date:run egrep:run 130USE_TOOLS+= cut:run date:run egrep:run
133USE_TOOLS+= expr:run find:run grep:run 131USE_TOOLS+= expr:run find:run grep:run
134USE_TOOLS+= head:run id:run ls:run 132USE_TOOLS+= head:run id:run ls:run
135USE_TOOLS+= mv:run rm:run sed:run 133USE_TOOLS+= mv:run rm:run sed:run
136USE_TOOLS+= sort:run tail:run touch:run 134USE_TOOLS+= sort:run tail:run touch:run
137USE_TOOLS+= tr:run wc:run bash:run 135USE_TOOLS+= tr:run wc:run bash:run
138 136
139MAKE_DIRS+= ${XYMONTOPDIR} 137MAKE_DIRS+= ${XYMONTOPDIR}
140MAKE_DIRS+= ${XYMONHOME} 138MAKE_DIRS+= ${XYMONHOME}
141 139
142MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages root wheel 0755 140MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages root wheel 0755
143MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man1 root wheel 0755 141MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man1 root wheel 0755
144MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man5 root wheel 0755 142MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man5 root wheel 0755
145MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man7 root wheel 0755 143MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man7 root wheel 0755
146MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man8 root wheel 0755 144MAKE_DIRS_PERMS+= ${EXAMPLEDIR}/www/help/manpages/man8 root wheel 0755
147 145
148OWN_DIRS_PERMS+= ${XYEXTDIR} ${XYMONUSER} ${XYMONGROUP} 0755 146OWN_DIRS_PERMS+= ${XYEXTDIR} ${XYMONUSER} ${XYMONGROUP} 0755
149OWN_DIRS_PERMS+= ${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755 147OWN_DIRS_PERMS+= ${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755
150OWN_DIRS_PERMS+= ${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755 148OWN_DIRS_PERMS+= ${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755
151 149
152OWN_DIRS_PERMS+= ${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755 150OWN_DIRS_PERMS+= ${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755
153VAR_SUBDIRS= acks data disabled download hist histlogs hostdata rrd 151VAR_SUBDIRS= acks data disabled download hist histlogs hostdata rrd
154.for dir in ${VAR_SUBDIRS} 152.for dir in ${VAR_SUBDIRS}
155OWN_DIRS_PERMS+= ${XYMONVAR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755 153OWN_DIRS_PERMS+= ${XYMONVAR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755
156.endfor 154.endfor
157 155
158OWN_DIRS_PERMS+= ${XYWWWDIR} ${XYMONUSER} ${XYMONGROUP} 0755 156OWN_DIRS_PERMS+= ${XYWWWDIR} ${XYMONUSER} ${XYMONGROUP} 0755
159WWW_SUBDIRS= gifs help html menu notes wml 157WWW_SUBDIRS= gifs help html menu notes wml
160.for dir in ${WWW_SUBDIRS} 158.for dir in ${WWW_SUBDIRS}
161OWN_DIRS_PERMS+= ${XYWWWDIR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755 159OWN_DIRS_PERMS+= ${XYWWWDIR}/${dir} ${XYMONUSER} ${XYMONGROUP} 0755
162.endfor 160.endfor
163OWN_DIRS_PERMS+= ${XYWWWDIR}/rep ${XYMONUSER} ${APACHE_GROUP} 0755 161OWN_DIRS_PERMS+= ${XYWWWDIR}/rep ${XYMONUSER} ${APACHE_GROUP} 0755
164OWN_DIRS_PERMS+= ${XYWWWDIR}/snap ${XYMONUSER} ${APACHE_GROUP} 0755 162OWN_DIRS_PERMS+= ${XYWWWDIR}/snap ${XYMONUSER} ${APACHE_GROUP} 0755
165 163
166OWN_DIRS_PERMS+= ${SECCGIDIR} ${XYMONUSER} ${XYMONGROUP} 0700 164OWN_DIRS_PERMS+= ${SECCGIDIR} ${XYMONUSER} ${XYMONGROUP} 0700
167 165
168# actual config files 166# actual config files
169 167
170CFILES= alerts.cfg analysis.cfg cgioptions.cfg client-local.cfg 168CFILES= alerts.cfg analysis.cfg cgioptions.cfg client-local.cfg
171CFILES+= columndoc.csv columndoc.csv combo.cfg 169CFILES+= columndoc.csv columndoc.csv combo.cfg
172CFILES+= graphs.cfg holidays.cfg hosts.cfg protocols.cfg 170CFILES+= graphs.cfg holidays.cfg hosts.cfg protocols.cfg
173CFILES+= rrddefinitions.cfg snmpmibs.cfg tasks.cfg 171CFILES+= rrddefinitions.cfg snmpmibs.cfg tasks.cfg
174CFILES+= xymon-apache.conf xymonmenu.cfg xymonserver.cfg 172CFILES+= xymon-apache.conf xymonmenu.cfg xymonserver.cfg
175.for file in ${CFILES} 173.for file in ${CFILES}
176CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644 174CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644
177.endfor 175.endfor
178 176
179CFILES2= critical.cfg critical.cfg.bak 177CFILES2= critical.cfg critical.cfg.bak
180.for file in ${CFILES2} 178.for file in ${CFILES2}
181CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0664 179CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0664
182.endfor 180.endfor
183 181
184SECCGIFILES= ackinfo.cgi acknowledge.cgi criticaleditor.cgi 182SECCGIFILES= ackinfo.cgi acknowledge.cgi criticaleditor.cgi
185SECCGIFILES+= enadis.cgi useradm.cgi 183SECCGIFILES+= enadis.cgi useradm.cgi
186.for file in ${SECCGIFILES} 184.for file in ${SECCGIFILES}
187SPECIAL_PERMS+= ${SECCGIDIR}/../${file} ${XYMONUSER} ${XYMONGROUP} 0400 185SPECIAL_PERMS+= ${SECCGIDIR}/../${file} ${XYMONUSER} ${XYMONGROUP} 0400
188.endfor 186.endfor
189 187
190MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} 188MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
191MAKE_ENV+= PKGDIR=${PREFIX} 189MAKE_ENV+= PKGDIR=${PREFIX}
192MAKE_ENV+= INSTALLROOT=${DESTDIR} 190MAKE_ENV+= INSTALLROOT=${DESTDIR}
193MAKE_ENV+= PKGBUILD=y 191MAKE_ENV+= PKGBUILD=y
194MAKE_ENV+= RPATH=${COMPILER_RPATH_FLAG} 192MAKE_ENV+= RPATH=${COMPILER_RPATH_FLAG}
195MAKE_ENV+= ${TOOLS_ENV} 193MAKE_ENV+= ${TOOLS_ENV}
196 194
197MENUFILES= b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif 195MENUFILES= b2t-blue.gif b2t-grey.gif t2b-blue.gif t2b-grey.gif
198MENUFILES+= xymonmenu-blue.css xymonmenu-grey.css 196MENUFILES+= xymonmenu-blue.css xymonmenu-grey.css
199 197
200MANDIRS= man1 man5 man7 man8 198MANDIRS= man1 man5 man7 man8
201 199
202post-patch: 200post-patch:
203 ${CP} ${WRKSRC}/build/Makefile.FreeBSD \ 201 ${CP} ${WRKSRC}/build/Makefile.FreeBSD \
204 ${WRKSRC}/build/Makefile.DragonFly 202 ${WRKSRC}/build/Makefile.DragonFly
205 203
206post-install: 204post-install:
207.for file in ${MENUFILES} 205.for file in ${MENUFILES}
208 chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/menu/${file} 206 chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/menu/${file}
209.endfor 207.endfor
210 208
211 chmod 0755 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages 209 chmod 0755 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages
212 210
213.for dir in ${MANDIRS} 211.for dir in ${MANDIRS}
214 chmod 0644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/${dir}/* 212 chmod 0644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/${dir}/*
215 chmod 0755 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages/${dir} 213 chmod 0755 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages/${dir}
216 chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages/${dir}/* 214 chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages/${dir}/*
217.endfor 215.endfor
218 216
219.include "options.mk" 217.include "options.mk"
220.include "../../databases/rrdtool/buildlink3.mk" 218.include "../../databases/rrdtool/buildlink3.mk"
221.include "../../graphics/png/buildlink3.mk" 219.include "../../graphics/png/buildlink3.mk"
222.include "../../devel/pcre/buildlink3.mk" 220.include "../../devel/pcre/buildlink3.mk"
223.include "../../mk/apache.mk" 221.include "../../mk/apache.mk"
224 222
225.include "../../mk/bsd.pkg.mk" 223.include "../../mk/bsd.pkg.mk"