Thu Oct 11 18:42:20 2012 UTC ()
- fix FreeBSD/Dragonfly properly
- update to newest version

Upstream changelog:

Xymon release 4.3.10 - released on Aug 6 2012
=============================================

Main features in this release is the addition of inode-checks
on all major platforms, and a series of enhancements to the
build procedure.

Also, building Xymon on most common platforms is now explicitly
described in the "install" document.

* Fix build problems with "errno"
* Fix build problems with OpenSSL in non-default locations
* Fix build problems with certain LDAP configurations
* Fix build problems with RRDtool on FreeBSD / OpenBSD
* Fix problem with ifstat data from Fedora in graphs
* "inode" check on FreeBSD, OpenBSD, OSX, Solaris, HP/UX, AIX
  in addition to existing support for Linux
* Document building and installing Xymon on common platforms
  (Linux, FreeBSD, OpenBSD, Solaris)
* Enhance xymoncfg so it can be used to import Xymon configuration
  settings into shell-scripts.

Xymon release 4.3.9 - released on Jul 24 2012
=============================================

This release is mainly a bug-fix release.

* Fix crash when XYMSRV is undefined but XYMSERVERS is
* Fix error in calculating combo-status messages with
  forward references
* Fix error in disable-until-TIME or disable-until-OK code
* Fix documentation of DURATION in alerts.cfg / xymond_alert so
  it is consistenly listed as being in "minutes".
* Permit explicit use of ">" and ">=" in alerts.cfg
* Permit building without the RRDtool libraries, e.g. for
  a network-tester build, but with trend-graphing disabled.
* Full compiler-warning cleanup
* Various configuration/build-script issues fixed.

Xymon release 4.3.8 - released on Jul 15 2012
=============================================

This release is mainly a bug-fix release.

Bugfixes
* Workaround for DNS timeout handling, now fixed at approximately 25
  seconds.
* "hostinfo" command for xymond documented
* confreport only shows processes that are monitored
* analysis.cfg parsing of COLOR for UP rules was broken
* RRD handlers no longer crash after receiving 1 billion updates
* Using .netrc for authentication could crash xymonnet
* "directory" includes would report the wrong filename for missing
  directories.
* useradm CGI would invoke htpassword twice
* "include" and "directory" now ignores trailing whitespace
* SSLv2 support disabled if SSL-library does not support it
* Minor bugfixes and cleanups of compiler warnings.

Enhancements
* Service status on info page now links to the detailed status page.
* Add RRDGRAPHOPTS setting to permit global user-specified RRD options,
  e.g. for font to showgraph CGI
* Add check for the size of public keys used in SSL certificates
  (enabled via --sslkeysize=N option for xymonnet)
* Optionally disable the display of SSL ciphers in the sslcert status
  (the --no-cipherlist option for xymonnet)
* Improved build-scripts works on newer systems with libraries in
  new and surprising places
* Reduce xymonnet memory usage and runtime for ping tests when there
  are multiple hosts.cfg entries with the same IP-address.
* Add code for inode-monitoring on Linux. Does not currently work on
  any other client platform.
* Added the ability to disable tests until a specific time, instead of
  for some interval. Disabling a test also now computes the expire time
  for the disable to happen at the next closest minute.


(spz)
diff -r1.25 -r1.26 pkgsrc/net/xymon/Makefile
diff -r1.9 -r1.10 pkgsrc/net/xymon/distinfo
diff -r1.3 -r1.4 pkgsrc/net/xymon/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/net/xymon/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/net/xymon/patches/patch-ae
diff -r1.2 -r1.3 pkgsrc/net/xymon/patches/patch-ah
diff -r1.2 -r1.3 pkgsrc/net/xymon/patches/patch-build_rrd.sh
diff -r0 -r1.1 pkgsrc/net/xymon/patches/patch-build_Makefile.FreeBSD
diff -r1.1 -r0 pkgsrc/net/xymon/patches/patch-lib_sha2.c
diff -r1.14 -r1.15 pkgsrc/net/xymonclient/Makefile
diff -r1.9 -r1.10 pkgsrc/net/xymonclient/distinfo
diff -r1.4 -r1.5 pkgsrc/net/xymonclient/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/net/xymonclient/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/net/xymonclient/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/net/xymonclient/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/net/xymonclient/patches/patch-ae
diff -r1.1.1.1 -r1.2 pkgsrc/net/xymonclient/patches/patch-af
diff -r1.2 -r0 pkgsrc/net/xymonclient/patches/patch-ag
diff -r0 -r1.1 pkgsrc/net/xymonclient/patches/patch-build_Makefile.FreeBSD
diff -r1.1 -r0 pkgsrc/net/xymonclient/patches/patch-lib_sha2.c
cvs diff -r1.25 -r1.26 pkgsrc/net/xymon/Makefile (expand / switch to unified diff)

--- pkgsrc/net/xymon/Makefile 2012/10/08 23:02:19 1.25
+++ pkgsrc/net/xymon/Makefile 2012/10/11 18:42:19 1.26
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.25 2012/10/08 23:02:19 adam Exp $ 1# $NetBSD: Makefile,v 1.26 2012/10/11 18:42:19 spz Exp $
2# 2#
3 3
4DISTNAME= xymon-4.3.7 4DISTNAME= xymon-4.3.10
5PKGREVISION= 5 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
8 7
9MAINTAINER= spz@NetBSD.org 8MAINTAINER= spz@NetBSD.org
10HOMEPAGE= http://sourceforge.net/projects/xymon/ 9HOMEPAGE= http://sourceforge.net/projects/xymon/
11COMMENT= Network services monitor a la Big Brother 10COMMENT= Network services monitor a la Big Brother
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
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 20 # xymonclient ought to be the same version as the server, modulo nbN
22DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient 21DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient
23 22
24HAS_CONFIGURE= YES 23HAS_CONFIGURE= YES
25USE_TOOLS+= gmake 24USE_TOOLS+= gmake
26 25
27.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
28 27
29# xymons user/group 28# xymons user/group
30 29
31XYMONUSER?= xymon 30XYMONUSER?= xymon
32XYMONGROUP?= xymon 31XYMONGROUP?= xymon
33 32
cvs diff -r1.9 -r1.10 pkgsrc/net/xymon/distinfo (expand / switch to unified diff)

--- pkgsrc/net/xymon/distinfo 2012/08/13 18:47:40 1.9
+++ pkgsrc/net/xymon/distinfo 2012/10/11 18:42:19 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.9 2012/08/13 18:47:40 marino Exp $ 1$NetBSD: distinfo,v 1.10 2012/10/11 18:42:19 spz Exp $
2 2
3SHA1 (xymon-4.3.7.tar.gz) = 29339157a1a6155d134ed1ad9985391d43034ee8 3SHA1 (xymon-4.3.10.tar.gz) = d37765da5741adc4282e081e3ad59862eb22353f
4RMD160 (xymon-4.3.7.tar.gz) = 9547eac47a5893f978cace54b5761e9cabe75941 4RMD160 (xymon-4.3.10.tar.gz) = df5e01ab4528bc1146cdf784bbf69616f743bfa1
5Size (xymon-4.3.7.tar.gz) = 2740378 bytes 5Size (xymon-4.3.10.tar.gz) = 2754807 bytes
6SHA1 (patch-aa) = c74991627bfc4286a67f66e45915c3af69b38c2f 6SHA1 (patch-aa) = c74991627bfc4286a67f66e45915c3af69b38c2f
7SHA1 (patch-ab) = d6079a2f09c38f701c553ab9744731050f66772c 7SHA1 (patch-ab) = 2914624fde86a888639be356c6f28eefd47b5eb6
8SHA1 (patch-ac) = f65831af9899167e291aabd691945e9e4fc1d44b 8SHA1 (patch-ac) = f65831af9899167e291aabd691945e9e4fc1d44b
9SHA1 (patch-ad) = dadd2d81ed55c70f03994b2d868cfe643969a8ba 9SHA1 (patch-ad) = 218ef05eb3d51d779230c357d731b2f904d4559f
10SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5 10SHA1 (patch-ae) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
11SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5 11SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5
12SHA1 (patch-ah) = 29942670246f55cf4e703b028cd9a0dcb0acb681 12SHA1 (patch-ah) = 03fee4b97cc3301339ace1ce459e7b679b83f96a
13SHA1 (patch-build_rrd.sh) = 6c9393b93265d3c6d5bda801a875ec66f3759b01 13SHA1 (patch-build_Makefile.FreeBSD) = e58b50f35068cba6fed89cc21bcc4eb7d30efd23
 14SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b
14SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f 15SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f
15SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d 16SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d
16SHA1 (patch-lib_sha2.c) = 363b1680bfb70acfd5a4f768fb9688f4511846be 
17SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae 17SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae
cvs diff -r1.3 -r1.4 pkgsrc/net/xymon/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ab 2011/10/16 15:19:08 1.3
+++ pkgsrc/net/xymon/patches/patch-ab 2012/10/11 18:42:19 1.4
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1$NetBSD: patch-ab,v 1.3 2011/10/16 15:19:08 spz Exp $ 1$NetBSD: patch-ab,v 1.4 2012/10/11 18:42:19 spz Exp $
2 2
3add SNMPCONFIG var for non-standard PREFIX 3add SNMPCONFIG var for non-standard PREFIX
4add lots of pkgsrc magic 4add lots of pkgsrc magic
5 5
6--- build/Makefile.rules.orig 2011-09-03 13:57:39.000000000 +0000 6--- build/Makefile.rules.orig 2012-08-02 11:20:21.000000000 +0000
7+++ build/Makefile.rules 7+++ build/Makefile.rules
8@@ -22,9 +22,9 @@ else 8@@ -22,9 +22,9 @@ else
9 INSTALLTARGETS = install-client install-clientmsg 9 INSTALLTARGETS = install-client install-clientmsg
10 endif 10 endif
11 else 11 else
12- BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client 12- BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client
13- CLIENTTARGETS = lib-client common-client build-build 13- CLIENTTARGETS = lib-client common-client build-build
14- INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg 14- INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg
15+ BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build # client 15+ BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build # client
16+ CLIENTTARGETS = # lib-client common-client build-build 16+ CLIENTTARGETS = # lib-client common-client build-build
17+ INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg # install-client 17+ INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg # install-client
18 CFLAGS += $(PCREINCDIR) 18 CFLAGS += $(PCREINCDIR)
19 endif 19 endif
20  20
21@@ -34,6 +34,9 @@ endif 21@@ -34,6 +34,9 @@ endif
22 ifndef INSTALLETCDIR 22 ifndef INSTALLETCDIR
23 INSTALLETCDIR = $(XYMONHOME)/etc 23 INSTALLETCDIR = $(XYMONHOME)/etc
24 endif 24 endif
25+ifndef INSTALLEXADIR 25+ifndef INSTALLEXADIR
26+INSTALLEXADIR = $(XYMONHOME)/etc 26+INSTALLEXADIR = $(XYMONHOME)/etc
27+endif 27+endif
28 ifndef INSTALLEXTDIR 28 ifndef INSTALLEXTDIR
29 INSTALLEXTDIR = $(XYMONHOME)/ext 29 INSTALLEXTDIR = $(XYMONHOME)/ext
30 endif 30 endif
31@@ -94,7 +97,7 @@ xymongen-build: lib-build common-build 31@@ -95,7 +98,7 @@ xymongen-build: lib-build common-build
32  32
33  33
34 xymonnet-build: lib-build common-build 34 xymonnet-build: lib-build common-build
35- CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" LDAPFLAGS="$(LDAPFLAGS)" LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all 35- CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" DOLDAP="$(DOLDAP)" LDAPFLAGS="$(LDAPFLAGS)" LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" SQLITELIBS="$(SQLITELIBS)" ZLIBINCDIR="$(ZLIBINCDIR)" ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all
36+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" LDAPFLAGS="$(LDAPFLAGS)" LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" SNMPCONFIG="$(SNMPCONFIG)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all 36+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" DOLDAP="$(DOLDAP)" LDAPFLAGS="$(LDAPFLAGS)" LDAPINCDIR="$(LDAPINCDIR)" LDAPLIBS="$(LDAPLIBS)" DOSNMP="$(DOSNMP)" SNMPCONFIG="$(SNMPCONFIG)" NETLIBS="$(NETLIBS)" XYMONHOME="$(XYMONHOME)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" SQLITELIBS="$(SQLITELIBS)" ZLIBINCDIR="$(ZLIBINCDIR)" ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C xymonnet all
37  37
38 xymonproxy-build: lib-build common-build 38 xymonproxy-build: lib-build common-build
39 CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C xymonproxy all 39 CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C xymonproxy all
40@@ -167,72 +170,77 @@ install-servermsg: 40@@ -168,72 +171,77 @@ install-servermsg:
41 @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}" 41 @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}"
42  42
43 install-dirs: 43 install-dirs:
44- mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR) 44- mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR)
45+ mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR) 45+ mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR)
46+ mkdir -p $(INSTALLROOT)$(XYMONVAR)/download  46+ mkdir -p $(INSTALLROOT)$(XYMONVAR)/download
47  47
48 mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) 48 mkdir -p $(INSTALLROOT)$(INSTALLBINDIR)
49+ifndef PKGBUILD 49+ifndef PKGBUILD
50 ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin) 50 ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin)
51 rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true 51 rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true
52 ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true 52 ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true
53 endif 53 endif
@@ -113,59 +113,59 @@ add lots of pkgsrc magic @@ -113,59 +113,59 @@ add lots of pkgsrc magic
113 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 113 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
114 ifdef HTTPDGID 114 ifdef HTTPDGID
115 # The www/rep and www/snap directories must be writable by the apache daemon 115 # The www/rep and www/snap directories must be writable by the apache daemon
116 chgrp $(HTTPDGID) $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap 116 chgrp $(HTTPDGID) $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap
117-endif 117-endif
118 chmod g+w $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap 118 chmod g+w $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap
119 endif 119 endif
120+else 120+else
121+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)/www $(INSTALLROOT)$(INSTALLEXADIR)/www/gifs $(INSTALLROOT)$(INSTALLEXADIR)/www/help $(INSTALLROOT)$(INSTALLEXADIR)/www/menu 121+ mkdir -p $(INSTALLROOT)$(INSTALLEXADIR)/www $(INSTALLROOT)$(INSTALLEXADIR)/www/gifs $(INSTALLROOT)$(INSTALLEXADIR)/www/help $(INSTALLROOT)$(INSTALLEXADIR)/www/menu
122+endif 122+endif
123  123
124 mkdir -p $(INSTALLROOT)$(XYMONVAR)/acks 124 mkdir -p $(INSTALLROOT)$(XYMONVAR)/acks
125 ifndef PKGBUILD 125 ifndef PKGBUILD
126@@ -283,25 +291,25 @@ ifndef PKGBUILD 126@@ -284,25 +292,25 @@ ifndef PKGBUILD
127 endif 127 endif
128  128
129 install-common: install-dirs 129 install-common: install-dirs
130- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install 130- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
131+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install 131+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
132  132
133 install-xymongen: install-common 133 install-xymongen: install-common
134- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install 134- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
135+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install 135+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
136  136
137 install-xymongen-nocgi: install-common 137 install-xymongen-nocgi: install-common
138- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi 138- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
139+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi 139+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
140  140
141 install-xymonnet: install-common 141 install-xymonnet: install-common
142- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install 142- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
143+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" SNMPCONFIG="$(SNMPCONFIG)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install 143+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
144  144
145 install-xymonproxy: install-common 145 install-xymonproxy: install-common
146- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install 146- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
147+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install 147+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
148  148
149 install-xymond: install-common 149 install-xymond: install-common
150- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install 150- DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
151+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install 151+ DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
152  152
153 install-web: install-common 153 install-web: install-common
154- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install 154- DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
155+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install 155+ DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
156  156
157  157
158 # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install" 158 # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install"
159@@ -314,10 +322,10 @@ install-man: 159@@ -315,10 +323,10 @@ install-man:
160 XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man 160 XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man
161  161
162 install-docs: 162 install-docs:
163- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install 163- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
164+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" $(MAKE) -C docs install 164+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLEXADIR)/www" $(MAKE) -C docs install
165  165
166 install-custom: 166 install-custom:
167- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" 167- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
168+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" 168+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
169  169
170  170
171 client-install: install-client 171 client-install: install-client
cvs diff -r1.5 -r1.6 pkgsrc/net/xymon/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ad 2011/10/15 23:04:51 1.5
+++ pkgsrc/net/xymon/patches/patch-ad 2012/10/11 18:42:19 1.6
@@ -1,31 +1,36 @@ @@ -1,31 +1,36 @@
1$NetBSD: patch-ad,v 1.5 2011/10/15 23:04:51 spz Exp $ 1$NetBSD: patch-ad,v 1.6 2012/10/11 18:42:19 spz Exp $
2 2
3- netbsd has stdint.h 3- netbsd has stdint.h
4- remove stray commas 4- remove stray commas
5 5
6--- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000 6--- build/Makefile.NetBSD.orig 2012-08-01 08:48:15.000000000 +0000
7+++ build/Makefile.NetBSD 7+++ build/Makefile.NetBSD
8@@ -1,7 +1,7 @@ 8@@ -1,7 +1,7 @@
9 # Xymon compile-time settings for NetBSD systems 9 # Xymon compile-time settings for NetBSD systems
10 # From Emmanuel Dreyfus. 10 # From Emmanuel Dreyfus.
11 # 11 #
12-OSDEF = -DBSD 12-OSDEF = -DBSD
13+OSDEF = -DBSD -DHAVE_STDINT_H 13+OSDEF = -DBSD -DHAVE_STDINT_H
14  14
15 # NETLIBS: None needed 15 # NETLIBS: None needed
16 NETLIBS = 16 NETLIBS =
17@@ -10,12 +10,12 @@ NETLIBS = 17@@ -12,16 +12,16 @@ CC= gcc
18 CC= gcc 18 GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
19 PKGDIR?=/usr/pkg 19 ifeq ($(GCCVER),4)
20 CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \ 20 CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
21- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 21- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
22+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib 22+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
 23 else
 24 CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
 25- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
 26+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
 27 endif
23 RPATH = "-Wl,--rpath," 28 RPATH = "-Wl,--rpath,"
24  29
25 # Compile flags for debugging 30 # Compile flags for debugging
26 # CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) \ 31 # CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) \
27- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 32- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
28+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib 33+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
29  34
30 # Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject 35 # Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject
31 # Typically, this will be "mail" or "mailx" 36 # Typically, this will be "mail" or "mailx"
cvs diff -r1.2 -r1.3 pkgsrc/net/xymon/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ae 2011/04/22 14:52:18 1.2
+++ pkgsrc/net/xymon/patches/patch-ae 2012/10/11 18:42:19 1.3
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-ae,v 1.2 2011/04/22 14:52:18 spz Exp $ 1$NetBSD: patch-ae,v 1.3 2012/10/11 18:42:19 spz Exp $
 2
 3allow setting the path to wc and df via environment variable WC and DF,
 4respectively
2 5
3--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000 6--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000
4+++ build/bb-commands.sh 7+++ build/bb-commands.sh
5@@ -9,6 +9,11 @@ 8@@ -9,6 +9,11 @@
6  9
7 findbin() { 10 findbin() {
8 MYP="`echo ${PATH} | sed -e 's/:/ /g'`" 11 MYP="`echo ${PATH} | sed -e 's/:/ /g'`"
9+ eval _var=\"\${${ENVNAME}}\" 12+ eval _var=\"\${${ENVNAME}}\"
10+ if test -n "$_var"; then 13+ if test -n "$_var"; then
11+ echo "$_var" 14+ echo "$_var"
12+ return 15+ return
13+ fi 16+ fi
14  17
cvs diff -r1.2 -r1.3 pkgsrc/net/xymon/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ah 2011/10/16 15:19:09 1.2
+++ pkgsrc/net/xymon/patches/patch-ah 2012/10/11 18:42:19 1.3
@@ -1,31 +1,27 @@ @@ -1,31 +1,27 @@
1$NetBSD: patch-ah,v 1.2 2011/10/16 15:19:09 spz Exp $ 1$NetBSD: patch-ah,v 1.3 2012/10/11 18:42:19 spz Exp $
2 2
3the c-ares dependencies are being difficult, manipulate it into working 3the c-ares dependencies are being difficult, manipulate it into working
4 4
5use a variable for the path to net-snmp-config, for cases with nonstandard 5use a variable for the path to net-snmp-config, for cases with nonstandard
6locations 6locations
7 7
8--- xymonnet/Makefile.orig 2011-08-19 11:26:58.000000000 +0000 8--- xymonnet/Makefile.orig 2012-07-13 16:50:38.000000000 +0000
9+++ xymonnet/Makefile 9+++ xymonnet/Makefile
10@@ -59,6 +59,8 @@ c-ares/configure: c-ares-$(ARESVER).tar. 10@@ -66,6 +66,8 @@ c-ares/configure: c-ares-$(ARESVER).tar.
11 mv c-ares-$(ARESVER) c-ares 11 mv c-ares-$(ARESVER) c-ares
12 # Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file. 12 # Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file.
13 touch c-ares/configure 13 touch c-ares/configure
14+ mkdir c-ares/.libs 14+ mkdir c-ares/.libs
15+ touch c-ares/.libs/libcares.la 15+ touch c-ares/.libs/libcares.la
16  16
17 beastat: $(BEASTATOBJS) ../lib/libxymon.a 17 beastat: $(BEASTATOBJS) $(XYMONCOMMLIB) $(XYMONTIMELIB)
18 $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) ../lib/libxymon.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF) 18 $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) $(XYMONCOMMLIBS) $(XYMONTIMELIBS) $(PCRELIBS)
19@@ -72,10 +74,10 @@ contest: contest.c httptest.o dns.o dns2 19@@ -82,7 +84,7 @@ xymon-snmpcollect: xymon-snmpcollect.o $
20  20 $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(XYMONCOMMLIBS) $(XYMONTIMELIBS)
21  
22 xymon-snmpcollect: xymon-snmpcollect.o $(LIBOBJS) 
23- $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `net-snmp-config --libs` ../lib/libxymon.a $(SSLLIBS) $(NETLIBS) $(LIBRTDEF) 
24+ $(CC) $(LDFLAGS) -o $@ xymon-snmpcollect.o `${SNMPCONFIG} --libs` ../lib/libxymon.a $(SSLLIBS) $(NETLIBS) $(LIBRTDEF) 
25  21
26 xymon-snmpcollect.o: xymon-snmpcollect.c 22 xymon-snmpcollect.o: xymon-snmpcollect.c
27- $(CC) $(CFLAGS) -I. `net-snmp-config --cflags` -c -o $@ xymon-snmpcollect.c 23- $(CC) $(CFLAGS) -I. `net-snmp-config --cflags` -c -o $@ xymon-snmpcollect.c
28+ $(CC) $(CFLAGS) -I. `${SNMPCONFIG} --cflags` -c -o $@ xymon-snmpcollect.c 24+ $(CC) $(CFLAGS) -I. `${SNMPCONFIG} --cflags` -c -o $@ xymon-snmpcollect.c
29  25
30 ################################################ 26 ################################################
31 # Default compilation rules 27 # Default compilation rules
cvs diff -r1.2 -r1.3 pkgsrc/net/xymon/patches/patch-build_rrd.sh (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-build_rrd.sh 2011/10/16 15:19:09 1.2
+++ pkgsrc/net/xymon/patches/patch-build_rrd.sh 2012/10/11 18:42:19 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-build_rrd.sh,v 1.2 2011/10/16 15:19:09 spz Exp $ 1$NetBSD: patch-build_rrd.sh,v 1.3 2012/10/11 18:42:19 spz Exp $
2 2
3make it possible to deal with nonstandard locations of libpng* and libz* 3make it possible to deal with nonstandard locations of libpng* and libz*
4 4
5--- build/rrd.sh.orig 2011-03-08 17:20:28.000000000 +0000 5--- build/rrd.sh.orig 2012-07-31 13:51:12.000000000 +0000
6+++ build/rrd.sh 6+++ build/rrd.sh
7@@ -70,6 +70,12 @@ 7@@ -70,6 +70,12 @@
8 if test "$USERRRDLIB" != ""; then 8 if test "$USERRRDLIB" != ""; then
9 RRDLIB="$USERRRDLIB" 9 RRDLIB="$USERRRDLIB"
10 fi 10 fi
11+ if test "$USERPNGCONFIG" != ""; then 11+ if test "$USERPNGCONFIG" != ""; then
12+ PNGLIB=`$USERPNGCONFIG --ldflags` 12+ PNGLIB=`$USERPNGCONFIG --ldflags`
13+ fi 13+ fi
14+ if test "$USERZLIB" != ""; then 14+ if test "$USERZLIB" != ""; then
15+ ZLIB="$USERZLIB" 15+ ZLIB="$USERZLIB"
16+ fi 16+ fi
17  17
18 if test -z "$RRDINC" -o -z "$RRDLIB"; then 18 # See if it builds
19 echo "RRDtool include- or library-files not found. These are REQUIRED for Xymon" 19 RRDOK="YES"
File Added: pkgsrc/net/xymon/patches/patch-build_Makefile.FreeBSD
$NetBSD: patch-build_Makefile.FreeBSD,v 1.1 2012/10/11 18:42:19 spz Exp $

FreeBSD has stdint.h

--- build/Makefile.FreeBSD.orig	2011-03-08 17:20:28.000000000 +0000
+++ build/Makefile.FreeBSD
@@ -1,6 +1,6 @@
 # Xymon compile-time settings for FreeBSD systems
 
-OSDEF = -DBSD
+OSDEF = -DBSD -DHAVE_STDINT_H
 
 # NETLIBS: None needed
 NETLIBS =
File Deleted: pkgsrc/net/xymon/patches/Attic/patch-lib_sha2.c
cvs diff -r1.14 -r1.15 pkgsrc/net/xymonclient/Makefile (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/Makefile 2012/08/13 17:28:24 1.14
+++ pkgsrc/net/xymonclient/Makefile 2012/10/11 18:42:19 1.15
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.14 2012/08/13 17:28:24 marino Exp $ 1# $NetBSD: Makefile,v 1.15 2012/10/11 18:42:19 spz Exp $
2# 2#
3 3
4DISTNAME= xymon-4.3.7 4DISTNAME= xymon-4.3.10
5PKGNAME= xymonclient-4.3.7 5PKGNAME= xymonclient-4.3.10
6PKGREVISION= 1 
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= http://xymon.sourceforge.net/ 10HOMEPAGE= http://xymon.sourceforge.net/
12COMMENT= Network services monitor a la Big Brother 11COMMENT= Network services monitor a la Big Brother
13 12
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17MAKE_JOBS_SAFE= NO 16MAKE_JOBS_SAFE= NO
18 17
19CONFLICTS+= hobbitmon-[0-9]* 18CONFLICTS+= hobbitmon-[0-9]*
cvs diff -r1.9 -r1.10 pkgsrc/net/xymonclient/distinfo (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/distinfo 2012/08/13 17:28:24 1.9
+++ pkgsrc/net/xymonclient/distinfo 2012/10/11 18:42:19 1.10
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1$NetBSD: distinfo,v 1.9 2012/08/13 17:28:24 marino Exp $ 1$NetBSD: distinfo,v 1.10 2012/10/11 18:42:19 spz Exp $
2 2
3SHA1 (xymon-4.3.7.tar.gz) = 29339157a1a6155d134ed1ad9985391d43034ee8 3SHA1 (xymon-4.3.10.tar.gz) = d37765da5741adc4282e081e3ad59862eb22353f
4RMD160 (xymon-4.3.7.tar.gz) = 9547eac47a5893f978cace54b5761e9cabe75941 4RMD160 (xymon-4.3.10.tar.gz) = df5e01ab4528bc1146cdf784bbf69616f743bfa1
5Size (xymon-4.3.7.tar.gz) = 2740378 bytes 5Size (xymon-4.3.10.tar.gz) = 2754807 bytes
6SHA1 (patch-aa) = 0810ac0098d3aa1f97ebee68d8d6cce1e09d6960 6SHA1 (patch-aa) = 02f3152f18ab7ecabba68d78d6404be366d05245
7SHA1 (patch-ab) = 21a760554e2cefd276eda4ee3905594287ad3482 7SHA1 (patch-ab) = ec71a05ac528675dbd406be0ea43729b2df1e106
8SHA1 (patch-ac) = db38e4ad886c01c2315be98fa49e6568c626722d 8SHA1 (patch-ac) = da7489b57fdbfc0937bcddeabb7cc57ef91e8431
9SHA1 (patch-ad) = aa29eefcf9f0fa87014166692dcf146cebd70ef5 9SHA1 (patch-ad) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
10SHA1 (patch-ae) = dadd2d81ed55c70f03994b2d868cfe643969a8ba 10SHA1 (patch-ae) = 218ef05eb3d51d779230c357d731b2f904d4559f
11SHA1 (patch-af) = ae5d0acde8e2cd05527253c41e31a806b04614f6 11SHA1 (patch-af) = d4929c2acc2136e281564b403e9f75cfcd4d87f3
12SHA1 (patch-ag) = 11f03fba971ef26c2f95104615178a619d9ff159 12SHA1 (patch-build_Makefile.FreeBSD) = e58b50f35068cba6fed89cc21bcc4eb7d30efd23
13SHA1 (patch-client_xymonclient-netbsd.sh) = 10d77fd722ecaaed7170b2ae6d51e6429a96d686 13SHA1 (patch-client_xymonclient-netbsd.sh) = 10d77fd722ecaaed7170b2ae6d51e6429a96d686
14SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d 14SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d
15SHA1 (patch-lib_sha2.c) = 363b1680bfb70acfd5a4f768fb9688f4511846be 
cvs diff -r1.4 -r1.5 pkgsrc/net/xymonclient/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/patches/patch-aa 2012/08/07 06:51:58 1.4
+++ pkgsrc/net/xymonclient/patches/patch-aa 2012/10/11 18:42:19 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.4 2012/08/07 06:51:58 sbd Exp $ 1$NetBSD: patch-aa,v 1.5 2012/10/11 18:42:19 spz Exp $
 2
 3pkgsrcify
2 4
3--- configure.client.orig 2011-03-08 17:20:28.000000000 +0000 5--- configure.client.orig 2011-03-08 17:20:28.000000000 +0000
4+++ configure.client 6+++ configure.client
5@@ -75,7 +75,7 @@ then 7@@ -75,7 +75,7 @@ then
6 XYMONUSER="xymon" 8 XYMONUSER="xymon"
7 fi 9 fi
8  10
9-if test -z "$XYMONTOPDIR" 11-if test -z "$XYMONTOPDIR"
10+if test -z "$XYMONHOME" 12+if test -z "$XYMONHOME"
11 then 13 then
12 if test "`uname -s`" = "Darwin" 14 if test "`uname -s`" = "Darwin"
13 then 15 then
14@@ -92,29 +92,31 @@ then 16@@ -92,29 +92,31 @@ then
cvs diff -r1.4 -r1.5 pkgsrc/net/xymonclient/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/patches/patch-ab 2012/08/07 06:51:58 1.4
+++ pkgsrc/net/xymonclient/patches/patch-ab 2012/10/11 18:42:20 1.5
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1$NetBSD: patch-ab,v 1.4 2012/08/07 06:51:58 sbd Exp $ 1$NetBSD: patch-ab,v 1.5 2012/10/11 18:42:20 spz Exp $
2 2
3--- build/Makefile.rules.orig 2011-09-03 13:57:39.000000000 +0000 3pkgsrcify
 4
 5--- build/Makefile.rules.orig 2012-08-02 11:20:21.000000000 +0000
4+++ build/Makefile.rules 6+++ build/Makefile.rules
5@@ -34,6 +34,12 @@ endif 7@@ -34,6 +34,12 @@ endif
6 ifndef INSTALLETCDIR 8 ifndef INSTALLETCDIR
7 INSTALLETCDIR = $(XYMONHOME)/etc 9 INSTALLETCDIR = $(XYMONHOME)/etc
8 endif 10 endif
9+ifndef INSTALLEXADIR 11+ifndef INSTALLEXADIR
10+INSTALLEXADIR = $(XYMONHOME)/etc 12+INSTALLEXADIR = $(XYMONHOME)/etc
11+endif 13+endif
12+ifndef INSTALLLOCALDIR 14+ifndef INSTALLLOCALDIR
13+INSTALLLOCALDIR = $(XYMONHOME)/local 15+INSTALLLOCALDIR = $(XYMONHOME)/local
14+endif 16+endif
15 ifndef INSTALLEXTDIR 17 ifndef INSTALLEXTDIR
16 INSTALLEXTDIR = $(XYMONHOME)/ext 18 INSTALLEXTDIR = $(XYMONHOME)/ext
17 endif 19 endif
18@@ -167,64 +173,66 @@ install-servermsg: 20@@ -168,64 +174,66 @@ install-servermsg:
19 @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}" 21 @echo "To view the Xymon webpages, go to http://${XYMONHOSTNAME}${XYMONHOSTURL}"
20  22
21 install-dirs: 23 install-dirs:
22- mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR) 24- mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONHOME)/download $(INSTALLROOT)$(XYMONVAR)
23+ mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR)/download 25+ mkdir -p $(INSTALLROOT)$(XYMONHOME) $(INSTALLROOT)$(XYMONVAR)/download
24  26
25 mkdir -p $(INSTALLROOT)$(INSTALLBINDIR) 27 mkdir -p $(INSTALLROOT)$(INSTALLBINDIR)
26+ifndef PKGBUILD 28+ifndef PKGBUILD
27 ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin) 29 ifneq ($(INSTALLBINDIR),$(XYMONHOME)/bin)
28 rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true 30 rm -f $(INSTALLROOT)$(XYMONHOME)/bin || true
29 ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true 31 ln -s $(INSTALLBINDIR) $(INSTALLROOT)$(XYMONHOME)/bin || true
30 endif 32 endif
31-ifndef PKGBUILD 33-ifndef PKGBUILD
@@ -79,60 +81,60 @@ $NetBSD: patch-ab,v 1.4 2012/08/07 06:51 @@ -79,60 +81,60 @@ $NetBSD: patch-ab,v 1.4 2012/08/07 06:51
79 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWEBDIR) 81 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWEBDIR)
80 endif 82 endif
81  83
82 mkdir -p $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 84 mkdir -p $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
83+ifndef PKGBUILD 85+ifndef PKGBUILD
84 ifneq ($(INSTALLWWWDIR),$(XYMONHOME)/www) 86 ifneq ($(INSTALLWWWDIR),$(XYMONHOME)/www)
85 rm -f $(INSTALLROOT)$(XYMONHOME)/www || true 87 rm -f $(INSTALLROOT)$(XYMONHOME)/www || true
86 ln -s $(INSTALLWWWDIR) $(INSTALLROOT)$(XYMONHOME)/www || true 88 ln -s $(INSTALLWWWDIR) $(INSTALLROOT)$(XYMONHOME)/www || true
87 endif 89 endif
88-ifndef PKGBUILD 90-ifndef PKGBUILD
89 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 91 chown $(XYMONUSER) $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
90 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml 92 chgrp `$(IDTOOL) -g $(XYMONUSER)` $(INSTALLROOT)$(INSTALLWWWDIR) $(INSTALLROOT)$(INSTALLWWWDIR)/gifs $(INSTALLROOT)$(INSTALLWWWDIR)/help $(INSTALLROOT)$(INSTALLWWWDIR)/html $(INSTALLROOT)$(INSTALLWWWDIR)/menu $(INSTALLROOT)$(INSTALLWWWDIR)/notes $(INSTALLROOT)$(INSTALLWWWDIR)/rep $(INSTALLROOT)$(INSTALLWWWDIR)/snap $(INSTALLROOT)$(INSTALLWWWDIR)/wml
91 ifdef HTTPDGID 93 ifdef HTTPDGID
92@@ -283,25 +291,25 @@ ifndef PKGBUILD 94@@ -284,25 +292,25 @@ ifndef PKGBUILD
93 endif 95 endif
94  96
95 install-common: install-dirs 97 install-common: install-dirs
96- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install 98- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
97+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install 99+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C common install
98  100
99 install-xymongen: install-common 101 install-xymongen: install-common
100- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install 102- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
101+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install 103+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install
102  104
103 install-xymongen-nocgi: install-common 105 install-xymongen-nocgi: install-common
104- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi 106- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
105+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi 107+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymongen install-nocgi
106  108
107 install-xymonnet: install-common 109 install-xymonnet: install-common
108- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install 110- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
109+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install 111+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" ARESVER="$(ARESVER)" FPINGVER="$(FPINGVER)" DOSNMP="$(DOSNMP)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLEXADIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" PKGBUILD="$(PKGBUILD)" $(MAKE) -C xymonnet install
110  112
111 install-xymonproxy: install-common 113 install-xymonproxy: install-common
112- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install 114- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
113+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install 115+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C xymonproxy install
114  116
115 install-xymond: install-common 117 install-xymond: install-common
116- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install 118- DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
117+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install 119+ DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" HTTPDGID="$(HTTPDGID)" $(MAKE) -C xymond install
118  120
119 install-web: install-common 121 install-web: install-common
120- MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install 122- DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
121+ MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install 123+ DORRD="$(DORRD)" MANROOT="$(MANROOT)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" CGIDIR="$(CGIDIR)" SECURECGIDIR="$(SECURECGIDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONUSER="$(XYMONUSER)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C web install
122  124
123  125
124 # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install" 126 # NOTE: This one is normally not used - man-page install is done by the sub-Makefiles during "make install"
125@@ -314,23 +322,23 @@ install-man: 127@@ -315,23 +323,23 @@ install-man:
126 XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man 128 XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" $(MAKE) -C web install-man
127  129
128 install-docs: 130 install-docs:
129- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install 131- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
130+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install 132+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C docs install
131  133
132 install-custom: 134 install-custom:
133- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" 135- XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLETCDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
134+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLLOCALDIR="$(INSTALLLOCALDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules" 136+ XYMONHOME="$(XYMONHOME)" MANROOT="$(MANROOT)" INSTALLROOT="$(INSTALLROOT)" INSTALLBINDIR="$(INSTALLBINDIR)" INSTALLETCDIR="$(INSTALLEXADIR)" INSTALLLOCALDIR="$(INSTALLLOCALDIR)" INSTALLEXTDIR="$(INSTALLEXTDIR)" INSTALLTMPDIR="$(INSTALLTMPDIR)" INSTALLWEBDIR="$(INSTALLWEBDIR)" INSTALLWWWDIR="$(INSTALLWWWDIR)" $(MAKE) -C custom install || echo "Skipped custom modules"
135  137
136  138
137 client-install: install-client 139 client-install: install-client
138  140
cvs diff -r1.4 -r1.5 pkgsrc/net/xymonclient/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/patches/patch-ac 2012/08/07 06:51:58 1.4
+++ pkgsrc/net/xymonclient/patches/patch-ac 2012/10/11 18:42:20 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ac,v 1.4 2012/08/07 06:51:58 sbd Exp $ 1$NetBSD: patch-ac,v 1.5 2012/10/11 18:42:20 spz Exp $
 2
 3pkgsrcify
2 4
3--- client/Makefile.orig 2011-12-12 22:15:39.000000000 +0000 5--- client/Makefile.orig 2011-12-12 22:15:39.000000000 +0000
4+++ client/Makefile 6+++ client/Makefile
5@@ -19,6 +19,25 @@ endif 7@@ -19,6 +19,25 @@ endif
6 PROGRAMS=xymonlaunch logfetch clientupdate orcaxymon msgcache 8 PROGRAMS=xymonlaunch logfetch clientupdate orcaxymon msgcache
7 COMMONTOOLS=xymon xymoncmd xymongrep xymoncfg xymondigest 9 COMMONTOOLS=xymon xymoncmd xymongrep xymoncfg xymondigest
8  10
9+ifndef INSTALLBINDIR 11+ifndef INSTALLBINDIR
10+INSTALLBINDIR = $(XYMONHOME)/bin 12+INSTALLBINDIR = $(XYMONHOME)/bin
11+endif 13+endif
12+ifndef INSTALLETCDIR 14+ifndef INSTALLETCDIR
13+INSTALLETCDIR = $(XYMONHOME)/etc 15+INSTALLETCDIR = $(XYMONHOME)/etc
14+endif 16+endif
cvs diff -r1.2 -r1.3 pkgsrc/net/xymonclient/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/patches/patch-ad 2011/04/22 15:37:02 1.2
+++ pkgsrc/net/xymonclient/patches/patch-ad 2012/10/11 18:42:20 1.3
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-ad,v 1.2 2011/04/22 15:37:02 spz Exp $ 1$NetBSD: patch-ad,v 1.3 2012/10/11 18:42:20 spz Exp $
 2
 3allow setting the path to wc and df via environment variable WC and DF,
 4respectively
2 5
3--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000 6--- build/bb-commands.sh.orig 2011-03-08 17:20:28.000000000 +0000
4+++ build/bb-commands.sh 7+++ build/bb-commands.sh
5@@ -9,6 +9,11 @@ 8@@ -9,6 +9,11 @@
6  9
7 findbin() { 10 findbin() {
8 MYP="`echo ${PATH} | sed -e 's/:/ /g'`" 11 MYP="`echo ${PATH} | sed -e 's/:/ /g'`"
9+ eval _var=\"\${${ENVNAME}}\" 12+ eval _var=\"\${${ENVNAME}}\"
10+ if test -n "$_var"; then 13+ if test -n "$_var"; then
11+ echo "$_var" 14+ echo "$_var"
12+ return 15+ return
13+ fi 16+ fi
14  17
cvs diff -r1.2 -r1.3 pkgsrc/net/xymonclient/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/patches/patch-ae 2011/10/15 23:04:51 1.2
+++ pkgsrc/net/xymonclient/patches/patch-ae 2012/10/11 18:42:20 1.3
@@ -1,31 +1,36 @@ @@ -1,31 +1,36 @@
1$NetBSD: patch-ae,v 1.2 2011/10/15 23:04:51 spz Exp $ 1$NetBSD: patch-ae,v 1.3 2012/10/11 18:42:20 spz Exp $
2 2
3- netbsd has stdint.h 3- netbsd has stdint.h
4- remove stray commas 4- remove stray commas
5 5
6--- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000 6--- build/Makefile.NetBSD.orig 2012-08-01 08:48:15.000000000 +0000
7+++ build/Makefile.NetBSD 7+++ build/Makefile.NetBSD
8@@ -1,7 +1,7 @@ 8@@ -1,7 +1,7 @@
9 # Xymon compile-time settings for NetBSD systems 9 # Xymon compile-time settings for NetBSD systems
10 # From Emmanuel Dreyfus. 10 # From Emmanuel Dreyfus.
11 # 11 #
12-OSDEF = -DBSD 12-OSDEF = -DBSD
13+OSDEF = -DBSD -DHAVE_STDINT_H 13+OSDEF = -DBSD -DHAVE_STDINT_H
14  14
15 # NETLIBS: None needed 15 # NETLIBS: None needed
16 NETLIBS = 16 NETLIBS =
17@@ -10,12 +10,12 @@ NETLIBS = 17@@ -12,16 +12,16 @@ CC= gcc
18 CC= gcc 18 GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
19 PKGDIR?=/usr/pkg 19 ifeq ($(GCCVER),4)
20 CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \ 20 CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
21- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 21- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
22+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib 22+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
 23 else
 24 CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
 25- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
 26+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
 27 endif
23 RPATH = "-Wl,--rpath," 28 RPATH = "-Wl,--rpath,"
24  29
25 # Compile flags for debugging 30 # Compile flags for debugging
26 # CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) \ 31 # CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) \
27- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 32- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
28+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib 33+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
29  34
30 # Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject 35 # Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject
31 # Typically, this will be "mail" or "mailx" 36 # Typically, this will be "mail" or "mailx"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/xymonclient/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/net/xymonclient/patches/patch-af 2010/02/14 16:11:11 1.1.1.1
+++ pkgsrc/net/xymonclient/patches/patch-af 2012/10/11 18:42:20 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-af,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $ 1$NetBSD: patch-af,v 1.2 2012/10/11 18:42:20 spz Exp $
 2
 3use the correct type for physmem
2 4
3--- client/netbsd-meminfo.c.orig 2009-02-12 13:09:34.000000000 +0000 5--- client/netbsd-meminfo.c.orig 2009-02-12 13:09:34.000000000 +0000
4+++ client/netbsd-meminfo.c 6+++ client/netbsd-meminfo.c
5@@ -22,7 +22,7 @@ static char rcsid[] = "$Id: netbsd-memin 7@@ -22,7 +22,7 @@ static char rcsid[] = "$Id: netbsd-memin
6 int main(int argc, char *argv[]) 8 int main(int argc, char *argv[])
7 { 9 {
8 int hw_physmem[] = { CTL_HW, HW_PHYSMEM64 }; 10 int hw_physmem[] = { CTL_HW, HW_PHYSMEM64 };
9- int64 physmem; 11- int64 physmem;
10+ int64_t physmem; 12+ int64_t physmem;
11  13
12 int hw_pagesize[] = { CTL_HW, HW_PAGESIZE }; 14 int hw_pagesize[] = { CTL_HW, HW_PAGESIZE };
13 int pagesize; 15 int pagesize;
File Deleted: pkgsrc/net/xymonclient/patches/Attic/patch-ag
File Added: pkgsrc/net/xymonclient/patches/patch-build_Makefile.FreeBSD
$NetBSD: patch-build_Makefile.FreeBSD,v 1.1 2012/10/11 18:42:20 spz Exp $

FreeBSD has stdint.h

--- build/Makefile.FreeBSD.orig	2011-03-08 17:20:28.000000000 +0000
+++ build/Makefile.FreeBSD
@@ -1,6 +1,6 @@
 # Xymon compile-time settings for FreeBSD systems
 
-OSDEF = -DBSD
+OSDEF = -DBSD -DHAVE_STDINT_H
 
 # NETLIBS: None needed
 NETLIBS =
File Deleted: pkgsrc/net/xymonclient/patches/Attic/patch-lib_sha2.c