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 (expand / 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,18 +1,18 @@ @@ -1,18 +1,18 @@
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
@@ -80,26 +80,28 @@ FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR @@ -80,26 +80,28 @@ FILES_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}
@@ -208,16 +210,17 @@ post-install: @@ -208,16 +210,17 @@ post-install:
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 (expand / 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,19 +1,19 @@ @@ -1,19 +1,19 @@
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
cvs diff -r1.5 -r1.6 pkgsrc/net/xymon/patches/patch-aa (expand / 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,22 +1,22 @@ @@ -1,22 +1,22 @@
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
@@ -38,50 +38,59 @@ $NetBSD: patch-aa,v 1.5 2014/02/27 20:22 @@ -38,50 +38,59 @@ $NetBSD: patch-aa,v 1.5 2014/02/27 20:22
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