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 (expand / 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,16 +1,16 @@ @@ -1,16 +1,16 @@
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@
@@ -156,14 +156,13 @@ DEINSTALL) @@ -156,14 +156,13 @@ DEINSTALL)
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 (expand / 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,35 +1,33 @@ @@ -1,35 +1,33 @@
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}
@@ -87,27 +85,27 @@ FILES_SUBST+= XYTMPDIR=${XYTMPDIR} @@ -87,27 +85,27 @@ FILES_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}