Wed Dec 7 08:15:59 2022 UTC ()
xymon: Use pkgsrc/system c-ares instead of bundled.

Fixes build on systems that happen to put link libraries in LDFLAGS due to
incredibly strict configure script.  Bump PKGREVISION.


(jperkin)
diff -r1.69 -r1.70 pkgsrc/net/xymon/Makefile
diff -r1.21 -r1.22 pkgsrc/net/xymon/distinfo
diff -r1.5 -r1.6 pkgsrc/net/xymon/patches/patch-aa
cvs diff -r1.69 -r1.70 pkgsrc/net/xymon/Makefile (switch to unified diff)

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

--- pkgsrc/net/xymon/distinfo 2021/10/26 11:07:13 1.21
+++ pkgsrc/net/xymon/distinfo 2022/12/07 08:15:59 1.22
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: distinfo,v 1.21 2021/10/26 11:07:13 nia Exp $ 1$NetBSD: distinfo,v 1.22 2022/12/07 08:15:59 jperkin Exp $
2 2
3BLAKE2s (xymon-4.3.30.tar.gz) = 03a385a0e32188d4ca6fdbaa55bbb92d053ec706ee70ca0bcf483c3f5611a85f 3BLAKE2s (xymon-4.3.30.tar.gz) = 03a385a0e32188d4ca6fdbaa55bbb92d053ec706ee70ca0bcf483c3f5611a85f
4SHA512 (xymon-4.3.30.tar.gz) = f3f16ff55293d7d76cb0355151a82545a2b1ad708b59c031640c240379807228dca4ffa9c48a4e20ab75e270bda18b7306ea165b65eb18c9c6471b395fda7b62 4SHA512 (xymon-4.3.30.tar.gz) = f3f16ff55293d7d76cb0355151a82545a2b1ad708b59c031640c240379807228dca4ffa9c48a4e20ab75e270bda18b7306ea165b65eb18c9c6471b395fda7b62
5Size (xymon-4.3.30.tar.gz) = 3549653 bytes 5Size (xymon-4.3.30.tar.gz) = 3549653 bytes
6SHA1 (patch-aa) = 227b631c6e002712ebf6019d8473ca4b44904e4a 6SHA1 (patch-aa) = 7a1455860d5a65aec4b2c226400bf33afc01b78a
7SHA1 (patch-ab) = 39a6af51ec216bb8cbdb57a3c07d82fce559b27f 7SHA1 (patch-ab) = 39a6af51ec216bb8cbdb57a3c07d82fce559b27f
8SHA1 (patch-ac) = 518abacafb7f082ab2de6bcaace27d3e3d4de633 8SHA1 (patch-ac) = 518abacafb7f082ab2de6bcaace27d3e3d4de633
9SHA1 (patch-ad) = 4b5413ee14d035fb1b588207b86ebaf0ac122951 9SHA1 (patch-ad) = 4b5413ee14d035fb1b588207b86ebaf0ac122951
10SHA1 (patch-ae) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b 10SHA1 (patch-ae) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
11SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5 11SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5
12SHA1 (patch-ah) = db3ea148759f970d9c5e3ef600836751b7aafe12 12SHA1 (patch-ah) = db3ea148759f970d9c5e3ef600836751b7aafe12
13SHA1 (patch-build_Makefile.AIX) = e3a06992b075507a02f77a6b04ee4425cc2f8dd1 13SHA1 (patch-build_Makefile.AIX) = e3a06992b075507a02f77a6b04ee4425cc2f8dd1
14SHA1 (patch-build_Makefile.Darwin) = 3b86292fba80a05c03e8ace424cddfb726a974fc 14SHA1 (patch-build_Makefile.Darwin) = 3b86292fba80a05c03e8ace424cddfb726a974fc
15SHA1 (patch-build_Makefile.FreeBSD) = 6ebfa5bab2955eaa42b0021de085eb7ba536432b 15SHA1 (patch-build_Makefile.FreeBSD) = 6ebfa5bab2955eaa42b0021de085eb7ba536432b
16SHA1 (patch-build_Makefile.HP-UX) = bdd713b83f3670096bb10def6c59036d0a4aa377 16SHA1 (patch-build_Makefile.HP-UX) = bdd713b83f3670096bb10def6c59036d0a4aa377
17SHA1 (patch-build_Makefile.IRIX) = b0ce34295d199ffd1e9008569667abbe436a2355 17SHA1 (patch-build_Makefile.IRIX) = b0ce34295d199ffd1e9008569667abbe436a2355
18SHA1 (patch-build_Makefile.Linux) = bddfea6c8400fdd7d8a83a6958f1e4139ef988b6 18SHA1 (patch-build_Makefile.Linux) = bddfea6c8400fdd7d8a83a6958f1e4139ef988b6
19SHA1 (patch-build_Makefile.OSF1) = 1a7afce4beeef249b2435c2ef14f45b2c2dbf8a2 19SHA1 (patch-build_Makefile.OSF1) = 1a7afce4beeef249b2435c2ef14f45b2c2dbf8a2
20SHA1 (patch-build_Makefile.OSX) = a72b748600b043f458452ab37175c38087375559 20SHA1 (patch-build_Makefile.OSX) = a72b748600b043f458452ab37175c38087375559
21SHA1 (patch-build_Makefile.OpenBSD) = cf40c7839ba6290d349328e2e01a20bdaf274fc6 21SHA1 (patch-build_Makefile.OpenBSD) = cf40c7839ba6290d349328e2e01a20bdaf274fc6
22SHA1 (patch-build_Makefile.SunOS) = 71d134a30825a2d36fbb17731e722c89c79da807 22SHA1 (patch-build_Makefile.SunOS) = 71d134a30825a2d36fbb17731e722c89c79da807
23SHA1 (patch-build_Makefile.generic) = e96d5ee29630c9133caebfa752880be90726607c 23SHA1 (patch-build_Makefile.generic) = e96d5ee29630c9133caebfa752880be90726607c
24SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b 24SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b
25SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f 25SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f
26SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707 26SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707
27SHA1 (patch-configure) = 3754b9056c365b8664e5fc9620b17c4e13453b2e 27SHA1 (patch-configure) = 3754b9056c365b8664e5fc9620b17c4e13453b2e
28SHA1 (patch-web_Makefile) = a27fbb7e97ce0c2f30093d5b05b0af2708fb594b 28SHA1 (patch-web_Makefile) = a27fbb7e97ce0c2f30093d5b05b0af2708fb594b
29SHA1 (patch-xymond_client_netbsd.c) = 9034777cbf12e3e168cf1598bfd444468e3a5086 29SHA1 (patch-xymond_client_netbsd.c) = 9034777cbf12e3e168cf1598bfd444468e3a5086
30SHA1 (patch-xymond_rrd_do__disk.c) = e72cb0364e4e949e02a045da0abca46083624253 30SHA1 (patch-xymond_rrd_do__disk.c) = e72cb0364e4e949e02a045da0abca46083624253
31SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae 31SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae
32SHA1 (patch-xymonproxy_Makefile) = 8ecfa4ceb66f66b7d5f40c01339479b26865746e 32SHA1 (patch-xymonproxy_Makefile) = 8ecfa4ceb66f66b7d5f40c01339479b26865746e
cvs diff -r1.5 -r1.6 pkgsrc/net/xymon/patches/patch-aa (switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-aa 2014/02/27 20:22:41 1.5
+++ pkgsrc/net/xymon/patches/patch-aa 2022/12/07 08:15:59 1.6
@@ -1,87 +1,96 @@ @@ -1,87 +1,96 @@
1$NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $ 1$NetBSD: patch-aa,v 1.6 2022/12/07 08:15:59 jperkin Exp $
2 2
3add extra options for cases where PREFIX is not in a standard location 3add extra options for cases where PREFIX is not in a standard location
4 4
5add INSTALLEXADIR for some pkgsrc magic 5add INSTALLEXADIR for some pkgsrc magic
6 6
7$NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $ 7$NetBSD: patch-aa,v 1.6 2022/12/07 08:15:59 jperkin Exp $
8 8
9--- configure.server.orig 2014-01-26 12:39:20.000000000 +0000 9--- configure.server.orig 2019-04-22 18:20:02.000000000 +0000
10+++ configure.server 10+++ configure.server
11@@ -17,6 +17,8 @@ do 11@@ -17,6 +17,8 @@ do
12 To configure Xymon, the following options are available: 12 To configure Xymon, the following options are available:
13 --rrdinclude DIRECTORY : Specify location of RRDtool include files 13 --rrdinclude DIRECTORY : Specify location of RRDtool include files
14 --rrdlib DIRECTORY : Specify location of RRDtool libraries 14 --rrdlib DIRECTORY : Specify location of RRDtool libraries
15+ --pngconfig PROGRAM : Specify location of libpng-config program 15+ --pngconfig PROGRAM : Specify location of libpng-config program
16+ --zlib DIRECTORY : Specify location of Z library 16+ --zlib DIRECTORY : Specify location of Z library
17 --pcreinclude DIRECTORY : Specify location of PCRE include files 17 --pcreinclude DIRECTORY : Specify location of PCRE include files
18 --pcrelib DIRECTORY : Specify location of PCRE libraries 18 --pcrelib DIRECTORY : Specify location of PCRE libraries
19 --sslinclude DIRECTORY : Specify location of OpenSSL include files 19 --sslinclude DIRECTORY : Specify location of OpenSSL include files
20@@ -25,6 +27,7 @@ do 20@@ -25,6 +27,7 @@ do
21 --ldaplib DIRECTORY : Specify location of OpenLDAP libraries 21 --ldaplib DIRECTORY : Specify location of OpenLDAP libraries
22 --caresinclude DIRECTORY : Specify location of C-ARES include files 22 --caresinclude DIRECTORY : Specify location of C-ARES include files
23 --careslib DIRECTORY : Specify location of C-ARES libraries 23 --careslib DIRECTORY : Specify location of C-ARES libraries
24+ --snmpconfig PROGRAM : Specify location of net-snmp-config program 24+ --snmpconfig PROGRAM : Specify location of net-snmp-config program
25 --fping FILENAME : Specify location of the Fping program 25 --fping FILENAME : Specify location of the Fping program
26  26
27 The script will search a number of standard directories for 27 The script will search a number of standard directories for
28@@ -38,6 +41,12 @@ EOF 28@@ -38,6 +41,12 @@ EOF
29 "--rrdlib") 29 "--rrdlib")
30 USERRRDLIB="$1"; shift 30 USERRRDLIB="$1"; shift
31 ;; 31 ;;
32+ "--pngconfig") 32+ "--pngconfig")
33+ USERPNGCONFIG="$1"; shift 33+ USERPNGCONFIG="$1"; shift
34+ ;; 34+ ;;
35+ "--zlib") 35+ "--zlib")
36+ USERZLIB="$1"; shift 36+ USERZLIB="$1"; shift
37+ ;; 37+ ;;
38 "--pcreinclude") 38 "--pcreinclude")
39 USERPCREINC="$1"; shift 39 USERPCREINC="$1"; shift
40 ;; 40 ;;
41@@ -62,6 +71,9 @@ EOF 41@@ -62,6 +71,9 @@ EOF
42 "--careslib") 42 "--careslib")
43 USERCARESLIB="$1"; shift 43 USERCARESLIB="$1"; shift
44 ;; 44 ;;
45+ "--snmpconfig") 45+ "--snmpconfig")
46+ USERSNMPCONFIG="$1"; shift 46+ USERSNMPCONFIG="$1"; shift
47+ ;; 47+ ;;
48 "--fping") 48 "--fping")
49 USERFPING="$1"; shift 49 USERFPING="$1"; shift
50 ;; 50 ;;
51@@ -400,14 +412,16 @@ then 51@@ -404,14 +416,16 @@ then
52 fi 52 fi
53 echo ""; echo "" 53 echo ""; echo ""
54  54
55-echo "# Toplevel Makefile for Xymon" > Makefile 55-echo "# Toplevel Makefile for Xymon" > Makefile
56+echo "# Toplevel Makefile for Xymon" > Makefile 56+echo "# Toplevel Makefile for Xymon" > Makefile
57  57
58 echo "BUILDTOPDIR=\`pwd\`" >>Makefile 58 echo "BUILDTOPDIR=\`pwd\`" >>Makefile
59 echo "" >>Makefile 59 echo "" >>Makefile
60-echo "# configure settings for Xymon" >>Makefile 60-echo "# configure settings for Xymon" >>Makefile
61+echo "# configure settings for Xymon" >>Makefile 61+echo "# configure settings for Xymon" >>Makefile
62 echo "#" >>Makefile 62 echo "#" >>Makefile
63 echo "# Toplevel dir" >>Makefile 63 echo "# Toplevel dir" >>Makefile
64 echo "XYMONTOPDIR = $XYMONTOPDIR" >>Makefile 64 echo "XYMONTOPDIR = $XYMONTOPDIR" >>Makefile
65+echo "# Linkfarm" >>Makefile 65+echo "# Linkfarm" >>Makefile
66+echo "XYMONHOME = $XYMONHOME" >>Makefile 66+echo "XYMONHOME = $XYMONHOME" >>Makefile
67 echo "# Server data dir for hist/ etc." >>Makefile 67 echo "# Server data dir for hist/ etc." >>Makefile
68 echo "XYMONVAR = $XYMONVAR" >>Makefile 68 echo "XYMONVAR = $XYMONVAR" >>Makefile
69 echo "# CGI scripts go in CGIDIR" >>Makefile 69 echo "# CGI scripts go in CGIDIR" >>Makefile
70@@ -527,6 +541,7 @@ echo "LIBRTDEF = $LIBRTDEF"  70@@ -453,7 +467,7 @@ then
 71 echo "CARESINCDIR = -I$CARESINC" >>Makefile
 72 fi
 73 if test "$CARESLIB" != ""; then
 74- echo "CARESLIBS = -L$LIB -lcares" >>Makefile
 75+ echo "CARESLIBS = -L$CARESLIB -lcares" >>Makefile
 76 echo "RPATHVAL += ${LIB}" >>Makefile
 77 else
 78 echo "CARESLIBS = -lcares" >>Makefile
 79@@ -531,6 +545,7 @@ echo "LIBRTDEF = $LIBRTDEF"
71 echo "" >>Makefile 80 echo "" >>Makefile
72 echo "# Net-SNMP settings" >>Makefile 81 echo "# Net-SNMP settings" >>Makefile
73 echo "DOSNMP = $DOSNMP" >>Makefile 82 echo "DOSNMP = $DOSNMP" >>Makefile
74+echo "SNMPCONFIG = $SNMPCONFIG" >>Makefile 83+echo "SNMPCONFIG = $SNMPCONFIG" >>Makefile
75 echo "" >>Makefile 84 echo "" >>Makefile
76  85
77 echo "# Large File Support settings" >>Makefile 86 echo "# Large File Support settings" >>Makefile
78@@ -557,6 +572,9 @@ fi 87@@ -561,6 +576,9 @@ fi
79 if test "$INSTALLETCDIR" != ""; then 88 if test "$INSTALLETCDIR" != ""; then
80 echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile 89 echo "INSTALLETCDIR = $INSTALLETCDIR" >>Makefile
81 fi 90 fi
82+if test "$INSTALLEXADIR" != ""; then 91+if test "$INSTALLEXADIR" != ""; then
83+ echo "INSTALLEXADIR = $INSTALLEXADIR" >>Makefile 92+ echo "INSTALLEXADIR = $INSTALLEXADIR" >>Makefile
84+fi 93+fi
85 if test "$INSTALLEXTDIR" != ""; then 94 if test "$INSTALLEXTDIR" != ""; then
86 echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile 95 echo "INSTALLEXTDIR = $INSTALLEXTDIR" >>Makefile
87 fi 96 fi