Thu Jan 6 11:53:26 2022 UTC ()
Ignore 'linsysfs' filesystem on FreeBSD


(hauke)
diff -r1.26 -r1.27 pkgsrc/net/xymonclient/Makefile
diff -r1.20 -r1.21 pkgsrc/net/xymonclient/distinfo
diff -r0 -r1.1 pkgsrc/net/xymonclient/patches/patch-client_xymonclient-freebsd.sh
cvs diff -r1.26 -r1.27 pkgsrc/net/xymonclient/Makefile (switch to unified diff)

--- pkgsrc/net/xymonclient/Makefile 2021/03/14 14:26:12 1.26
+++ pkgsrc/net/xymonclient/Makefile 2022/01/06 11:53:26 1.27
@@ -1,145 +1,145 @@ @@ -1,145 +1,145 @@
1# $NetBSD: Makefile,v 1.26 2021/03/14 14:26:12 spz Exp $ 1# $NetBSD: Makefile,v 1.27 2022/01/06 11:53:26 hauke Exp $
2# 2#
3 3
4DISTNAME= xymon-${PKGVERSION} 4DISTNAME= xymon-${PKGVERSION}
5PKGNAME= xymonclient-${PKGVERSION} 5PKGNAME= xymonclient-${PKGVERSION}
6PKGVERSION= 4.3.30 6PKGVERSION= 4.3.30
7#PKGREVISION= 0 7PKGREVISION= 1
8CATEGORIES= net 8CATEGORIES= net
9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} 9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
10 10
11MAINTAINER= spz@NetBSD.org 11MAINTAINER= spz@NetBSD.org
12HOMEPAGE= https://xymon.sourceforge.io/ 12HOMEPAGE= https://xymon.sourceforge.io/
13COMMENT= Network services monitor a la Big Brother 13COMMENT= Network services monitor a la Big Brother
14 14
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17MAKE_JOBS_SAFE= NO 17MAKE_JOBS_SAFE= NO
18 18
19CONFLICTS+= hobbitmon-[0-9]* 19CONFLICTS+= hobbitmon-[0-9]*
20CONFLICTS+= hobbitclient-[0-9]* 20CONFLICTS+= hobbitclient-[0-9]*
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_USERS_VARS+= XYMONUSER 39PKG_USERS_VARS+= XYMONUSER
40 40
41# startup and config 41# startup and config
42 42
43RCD_SCRIPTS+= xymonclient 43RCD_SCRIPTS+= xymonclient
44SMF_INSTANCES+= xymonclient 44SMF_INSTANCES+= xymonclient
45PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon 45PKG_SYSCONFDIR.xymon= ${PREFIX}/etc/xymon
46EXAMPLEDIR= ${PREFIX}/share/examples/xymon 46EXAMPLEDIR= ${PREFIX}/share/examples/xymon
47 47
48XYMONHOME?= ${PREFIX}/share/xymon/xymonhome 48XYMONHOME?= ${PREFIX}/share/xymon/xymonhome
49XYMONTOPDIR?= ${PREFIX}/libexec/xymon 49XYMONTOPDIR?= ${PREFIX}/libexec/xymon
50 50
51XYMONSERVERNAME?= "`uname -n`" 51XYMONSERVERNAME?= "`uname -n`"
52XYMONSERVERIP?= 127.0.0.1 52XYMONSERVERIP?= 127.0.0.1
53 53
54XYMONLOGDIR?= ${VARBASE}/log/xymon 54XYMONLOGDIR?= ${VARBASE}/log/xymon
55XYMONVAR?= ${VARBASE}/xymon 55XYMONVAR?= ${VARBASE}/xymon
56 56
57XYBINDIR?= ${XYMONTOPDIR} 57XYBINDIR?= ${XYMONTOPDIR}
58XYETCDIR?= ${PKG_SYSCONFDIR.xymon} 58XYETCDIR?= ${PKG_SYSCONFDIR.xymon}
59XYEXTDIR?= ${XYMONTOPDIR}/ext 59XYEXTDIR?= ${XYMONTOPDIR}/ext
60XYTMPDIR?= ${VARBASE}/xymon/tmp 60XYTMPDIR?= ${VARBASE}/xymon/tmp
61 61
62BUILD_DEFS+= VARBASE 62BUILD_DEFS+= VARBASE
63BUILD_DEFS+= XYMONSERVERNAME 63BUILD_DEFS+= XYMONSERVERNAME
64BUILD_DEFS+= XYMONSERVERIP 64BUILD_DEFS+= XYMONSERVERIP
65 65
66FILES_SUBST+= XYMONHOME=${XYMONHOME:Q} 66FILES_SUBST+= XYMONHOME=${XYMONHOME:Q}
67FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR} 67FILES_SUBST+= XYMONLOGDIR=${XYMONLOGDIR}
68FILES_SUBST+= XYMONVAR=${XYMONVAR:Q} 68FILES_SUBST+= XYMONVAR=${XYMONVAR:Q}
69FILES_SUBST+= XYBINDIR=${XYBINDIR} 69FILES_SUBST+= XYBINDIR=${XYBINDIR}
70FILES_SUBST+= XYETCDIR=${XYETCDIR} 70FILES_SUBST+= XYETCDIR=${XYETCDIR}
71FILES_SUBST+= XYEXTDIR=${XYEXTDIR} 71FILES_SUBST+= XYEXTDIR=${XYEXTDIR}
72FILES_SUBST+= XYTMPDIR=${XYTMPDIR} 72FILES_SUBST+= XYTMPDIR=${XYTMPDIR}
73 73
74CONFIGURE_ARGS+= "--client" 74CONFIGURE_ARGS+= "--client"
75 75
76CONFIGURE_ENV+= CONFTYPE="server" 76CONFIGURE_ENV+= CONFTYPE="server"
77CONFIGURE_ENV+= PKGBUILD=y 77CONFIGURE_ENV+= PKGBUILD=y
78CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q} 78CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q}
79CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q} 79CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q}
80CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q} 80CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q}
81CONFIGURE_ENV+= XYMONHOME=${XYMONHOME:Q} 81CONFIGURE_ENV+= XYMONHOME=${XYMONHOME:Q}
82CONFIGURE_ENV+= XYMONTOPDIR=${XYMONTOPDIR} 82CONFIGURE_ENV+= XYMONTOPDIR=${XYMONTOPDIR}
83CONFIGURE_ENV+= XYMONLOGDIR=${XYMONLOGDIR} 83CONFIGURE_ENV+= XYMONLOGDIR=${XYMONLOGDIR}
84CONFIGURE_ENV+= XYMONVAR=${XYMONVAR:Q} 84CONFIGURE_ENV+= XYMONVAR=${XYMONVAR:Q}
85CONFIGURE_ENV+= INSTALLROOT=${DESTDIR} 85CONFIGURE_ENV+= INSTALLROOT=${DESTDIR}
86CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR} 86CONFIGURE_ENV+= INSTALLBINDIR=${XYBINDIR}
87CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR} 87CONFIGURE_ENV+= INSTALLETCDIR=${XYETCDIR}
88CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR} 88CONFIGURE_ENV+= INSTALLEXADIR=${EXAMPLEDIR}
89CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR} 89CONFIGURE_ENV+= INSTALLEXTDIR=${XYEXTDIR}
90CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR} 90CONFIGURE_ENV+= INSTALLTMPDIR=${XYTMPDIR}
91CONFIGURE_ENV+= INSTALLLOCALDIR=${XYMONTOPDIR}/client/local 91CONFIGURE_ENV+= INSTALLLOCALDIR=${XYMONTOPDIR}/client/local
92CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/ 92CONFIGURE_ENV+= MANROOT=${PREFIX}/${PKGMANDIR}/
93 93
94USE_TOOLS+= awk:run cat:run cp:run 94USE_TOOLS+= awk:run cat:run cp:run
95USE_TOOLS+= cut:run date:run egrep:run 95USE_TOOLS+= cut:run date:run egrep:run
96USE_TOOLS+= expr:run find:run grep:run 96USE_TOOLS+= expr:run find:run grep:run
97USE_TOOLS+= head:run id:run ls:run 97USE_TOOLS+= head:run id:run ls:run
98USE_TOOLS+= mv:run rm:run sed 98USE_TOOLS+= mv:run rm:run sed
99USE_TOOLS+= sort:run tail:run touch:run 99USE_TOOLS+= sort:run tail:run touch:run
100USE_TOOLS+= tr:run wc:run 100USE_TOOLS+= tr:run wc:run
101 101
102 102
103OWN_DIRS+= ${XYMONTOPDIR} 103OWN_DIRS+= ${XYMONTOPDIR}
104MAKE_DIRS+= ${XYMONTOPDIR}/client 104MAKE_DIRS+= ${XYMONTOPDIR}/client
105OWN_DIRS+= ${EXAMPLEDIR} 105OWN_DIRS+= ${EXAMPLEDIR}
106OWN_DIRS+= ${PKG_SYSCONFDIR.xymon} 106OWN_DIRS+= ${PKG_SYSCONFDIR.xymon}
107OWN_DIRS+= ${XYMONHOME} 107OWN_DIRS+= ${XYMONHOME}
108MAKE_DIRS+= ${XYMONHOME}/client 108MAKE_DIRS+= ${XYMONHOME}/client
109 109
110OWN_DIRS_PERMS+= ${XYEXTDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755 110OWN_DIRS_PERMS+= ${XYEXTDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755
111OWN_DIRS_PERMS+= ${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755 111OWN_DIRS_PERMS+= ${XYMONLOGDIR} ${XYMONUSER} ${XYMONGROUP} 0755
112OWN_DIRS_PERMS+= ${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755 112OWN_DIRS_PERMS+= ${XYTMPDIR} ${XYMONUSER} ${XYMONGROUP} 0755
113OWN_DIRS_PERMS+= ${XYTMPDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755 113OWN_DIRS_PERMS+= ${XYTMPDIR}/client ${XYMONUSER} ${XYMONGROUP} 0755
114 114
115OWN_DIRS_PERMS+= ${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755 115OWN_DIRS_PERMS+= ${XYMONVAR} ${XYMONUSER} ${XYMONGROUP} 0755
116OWN_DIRS_PERMS+= ${XYMONVAR}/data ${XYMONUSER} ${XYMONGROUP} 0755 116OWN_DIRS_PERMS+= ${XYMONVAR}/data ${XYMONUSER} ${XYMONGROUP} 0755
117 117
118CFILES+= clientlaunch.cfg localclient.cfg xymonclient.cfg 118CFILES+= clientlaunch.cfg localclient.cfg xymonclient.cfg
119.for file in ${CFILES} 119.for file in ${CFILES}
120CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644 120CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644
121.endfor 121.endfor
122 122
123MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} 123MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q}
124MAKE_ENV+= PKGDIR=${PREFIX} 124MAKE_ENV+= PKGDIR=${PREFIX}
125MAKE_ENV+= INSTALLROOT=${DESTDIR} 125MAKE_ENV+= INSTALLROOT=${DESTDIR}
126MAKE_ENV+= PKGBUILD=y 126MAKE_ENV+= PKGBUILD=y
127MAKE_ENV+= ${TOOLS_ENV} 127MAKE_ENV+= ${TOOLS_ENV}
128 128
129#MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 129#MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
130#MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 130#MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
131 131
132PLIST_VARS+= meminfo 132PLIST_VARS+= meminfo
133.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "FreeBSD" 133.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "FreeBSD"
134PLIST.meminfo= yes 134PLIST.meminfo= yes
135.endif 135.endif
136 136
137post-patch: 137post-patch:
138 ${CP} ${WRKSRC}/build/Makefile.FreeBSD \ 138 ${CP} ${WRKSRC}/build/Makefile.FreeBSD \
139 ${WRKSRC}/build/Makefile.DragonFly 139 ${WRKSRC}/build/Makefile.DragonFly
140 # Add dragonfly-meminfo support later (placeholder) 140 # Add dragonfly-meminfo support later (placeholder)
141 ${SED} -e 's|freebsd-meminfo|dragonfly-meminfo|' \ 141 ${SED} -e 's|freebsd-meminfo|dragonfly-meminfo|' \
142 ${WRKSRC}/client/xymonclient-freebsd.sh > \ 142 ${WRKSRC}/client/xymonclient-freebsd.sh > \
143 ${WRKSRC}/client/xymonclient-dragonfly.sh 143 ${WRKSRC}/client/xymonclient-dragonfly.sh
144 144
145.include "../../mk/bsd.pkg.mk" 145.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/net/xymonclient/distinfo (switch to unified diff)

--- pkgsrc/net/xymonclient/distinfo 2021/10/26 11:07:13 1.20
+++ pkgsrc/net/xymonclient/distinfo 2022/01/06 11:53:26 1.21
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.20 2021/10/26 11:07:13 nia Exp $ 1$NetBSD: distinfo,v 1.21 2022/01/06 11:53:26 hauke 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) = c44f791ef6005c809127175cb563bd8f0ac74642 6SHA1 (patch-aa) = c44f791ef6005c809127175cb563bd8f0ac74642
7SHA1 (patch-ab) = db0c5808cfad75aaf37217509399597191236180 7SHA1 (patch-ab) = db0c5808cfad75aaf37217509399597191236180
8SHA1 (patch-ac) = d1694c2b67e6f2ae616b2a46de1a01d3199b45f5 8SHA1 (patch-ac) = d1694c2b67e6f2ae616b2a46de1a01d3199b45f5
9SHA1 (patch-ad) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b 9SHA1 (patch-ad) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
10SHA1 (patch-ae) = 4b5413ee14d035fb1b588207b86ebaf0ac122951 10SHA1 (patch-ae) = 4b5413ee14d035fb1b588207b86ebaf0ac122951
11SHA1 (patch-af) = 5e71a56cf827f9b30147dd577c295f10c150cd27 11SHA1 (patch-af) = 5e71a56cf827f9b30147dd577c295f10c150cd27
12SHA1 (patch-build_Makefile.AIX) = e3a06992b075507a02f77a6b04ee4425cc2f8dd1 12SHA1 (patch-build_Makefile.AIX) = e3a06992b075507a02f77a6b04ee4425cc2f8dd1
13SHA1 (patch-build_Makefile.Darwin) = 3b86292fba80a05c03e8ace424cddfb726a974fc 13SHA1 (patch-build_Makefile.Darwin) = 3b86292fba80a05c03e8ace424cddfb726a974fc
14SHA1 (patch-build_Makefile.FreeBSD) = 18010c36f754f28d50a921eac59382393f90cf4d 14SHA1 (patch-build_Makefile.FreeBSD) = 18010c36f754f28d50a921eac59382393f90cf4d
15SHA1 (patch-build_Makefile.HP-UX) = bdd713b83f3670096bb10def6c59036d0a4aa377 15SHA1 (patch-build_Makefile.HP-UX) = bdd713b83f3670096bb10def6c59036d0a4aa377
16SHA1 (patch-build_Makefile.IRIX) = b0ce34295d199ffd1e9008569667abbe436a2355 16SHA1 (patch-build_Makefile.IRIX) = b0ce34295d199ffd1e9008569667abbe436a2355
17SHA1 (patch-build_Makefile.Linux) = bddfea6c8400fdd7d8a83a6958f1e4139ef988b6 17SHA1 (patch-build_Makefile.Linux) = bddfea6c8400fdd7d8a83a6958f1e4139ef988b6
18SHA1 (patch-build_Makefile.OSF1) = 1a7afce4beeef249b2435c2ef14f45b2c2dbf8a2 18SHA1 (patch-build_Makefile.OSF1) = 1a7afce4beeef249b2435c2ef14f45b2c2dbf8a2
19SHA1 (patch-build_Makefile.OSX) = a72b748600b043f458452ab37175c38087375559 19SHA1 (patch-build_Makefile.OSX) = a72b748600b043f458452ab37175c38087375559
20SHA1 (patch-build_Makefile.OpenBSD) = cf40c7839ba6290d349328e2e01a20bdaf274fc6 20SHA1 (patch-build_Makefile.OpenBSD) = cf40c7839ba6290d349328e2e01a20bdaf274fc6
21SHA1 (patch-build_Makefile.SunOS) = 71d134a30825a2d36fbb17731e722c89c79da807 21SHA1 (patch-build_Makefile.SunOS) = 71d134a30825a2d36fbb17731e722c89c79da807
22SHA1 (patch-build_Makefile.generic) = e96d5ee29630c9133caebfa752880be90726607c 22SHA1 (patch-build_Makefile.generic) = e96d5ee29630c9133caebfa752880be90726607c
23SHA1 (patch-client_logfetch.c) = f99fa015fe597bfb37f1d288c4e5e3b99b65397d 23SHA1 (patch-client_logfetch.c) = f99fa015fe597bfb37f1d288c4e5e3b99b65397d
 24SHA1 (patch-client_xymonclient-freebsd.sh) = 6993a6251b1d3dec2817f30ce2b05ffd8cc3485b
24SHA1 (patch-client_xymonclient-netbsd.sh) = 739a201806144ef0e34c1f668ad3a4d9e2b9f9fb 25SHA1 (patch-client_xymonclient-netbsd.sh) = 739a201806144ef0e34c1f668ad3a4d9e2b9f9fb
25SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707 26SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707
26SHA1 (patch-configure) = 305a74a2383dcd37ea93456272d4254483023aa5 27SHA1 (patch-configure) = 305a74a2383dcd37ea93456272d4254483023aa5
File Added: pkgsrc/net/xymonclient/patches/patch-client_xymonclient-freebsd.sh
$NetBSD: patch-client_xymonclient-freebsd.sh,v 1.1 2022/01/06 11:53:26 hauke Exp $

Add linsysfs to filesystems whose 'level of filling' is uninteresting

--- client/xymonclient-freebsd.sh.orig	2015-12-16 15:13:03.000000000 +0000
+++ client/xymonclient-freebsd.sh
@@ -22,13 +22,13 @@ echo "[who]"
 who
 echo "[df]"
 # The sed stuff is to make sure lines are not split into two.
-df -H -tnonfs,nullfs,cd9660,procfs,devfs,linprocfs,fdescfs | sed -e '/^[^ 	][^ 	]*$/{
+df -H -tnonfs,nullfs,cd9660,procfs,devfs,linprocfs,linsysfs,fdescfs | sed -e '/^[^ 	][^ 	]*$/{
 N
 s/[ 	]*\n[ 	]*/ /
 }'
 echo "[inode]"
 # The sed stuff is to make sure lines are not split into two.
-df -i -tnonfs,nullfs,cd9660,procfs,devfs,linprocfs,fdescfs | sed -e '/^[^ 	][^ 	]*$/{
+df -i -tnonfs,nullfs,cd9660,procfs,devfs,linprocfs,linsysfs,fdescfs | sed -e '/^[^ 	][^ 	]*$/{
 N
 s/[ 	]*\n[ 	]*/ /
 }' | awk '