Sat Oct 15 18:09:28 2011 UTC ()
revert previous -- maintainer objected


(dholland)
diff -r1.11 -r1.12 pkgsrc/net/xymon/Makefile
diff -r1.3 -r1.4 pkgsrc/net/xymon/distinfo
diff -r1.3 -r1.4 pkgsrc/net/xymon/patches/patch-ad
diff -r1.1 -r0 pkgsrc/net/xymon/patches/patch-configure
cvs diff -r1.11 -r1.12 pkgsrc/net/xymon/Makefile (expand / switch to unified diff)

--- pkgsrc/net/xymon/Makefile 2011/10/15 16:37:47 1.11
+++ pkgsrc/net/xymon/Makefile 2011/10/15 18:09:28 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2011/10/15 16:37:47 spz Exp $ 1# $NetBSD: Makefile,v 1.12 2011/10/15 18:09:28 dholland Exp $
2# 2#
3 3
4DISTNAME= xymon-4.3.2 4DISTNAME= xymon-4.3.2
5PKGNAME= xymon-4.3.2 5PKGNAME= xymon-4.3.2
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://sourceforge.net/projects/xymon/ 11HOMEPAGE= http://sourceforge.net/projects/xymon/
12COMMENT= Network services monitor a la Big Brother 12COMMENT= Network services monitor a la Big Brother
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -88,28 +88,28 @@ FILES_SUBST+= XYTMPDIR=${XYTMPDIR} @@ -88,28 +88,28 @@ FILES_SUBST+= XYTMPDIR=${XYTMPDIR}
88FILES_SUBST+= XYWEBDIR=${XYWEBDIR} 88FILES_SUBST+= XYWEBDIR=${XYWEBDIR}
89FILES_SUBST+= XYWWWDIR=${XYWWWDIR} 89FILES_SUBST+= XYWWWDIR=${XYWWWDIR}
90 90
91MESSAGE_SUBST+= DESTDIR=${DESTDIR} 91MESSAGE_SUBST+= DESTDIR=${DESTDIR}
92MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 92MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
93MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR} 93MESSAGE_SUBST+= SECCGIDIR=${SECCGIDIR}
94 94
95EVAL_PREFIX+= PREFIX.fping=fping 95EVAL_PREFIX+= PREFIX.fping=fping
96 96
97CONFIGURE_ARGS+= "--server" 97CONFIGURE_ARGS+= "--server"
98 98
99CONFIGURE_ENV+= USERFPING=${PREFIX.fping}/sbin/fping 99CONFIGURE_ENV+= USERFPING=${PREFIX.fping}/sbin/fping
100CONFIGURE_ENV+= USEXYMONPING=n 100CONFIGURE_ENV+= USEXYMONPING=n
101CONFIGURE_ENV+= USERRRDINC=${BUILDLINK_PREFIX.rrdtool}/include 101CONFIGURE_ENV+= RRDINC=${BUILDLINK_PREFIX.rrdtool}/include
102CONFIGURE_ENV+= USERRRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a 102CONFIGURE_ENV+= RRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a
103CONFIGURE_ENV+= PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a 103CONFIGURE_ENV+= PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a
104CONFIGURE_ENV+= ENABLESSL=y 104CONFIGURE_ENV+= ENABLESSL=y
105CONFIGURE_ENV+= OSSLINC=${BUILDLINK_PREFIX.openssl}/include 105CONFIGURE_ENV+= OSSLINC=${BUILDLINK_PREFIX.openssl}/include
106CONFIGURE_ENV+= OSSLLIB=${BUILDLINK_PREFIX.openssl}/lib 106CONFIGURE_ENV+= OSSLLIB=${BUILDLINK_PREFIX.openssl}/lib
107CONFIGURE_ENV+= ENABLELDAP=y 107CONFIGURE_ENV+= ENABLELDAP=y
108CONFIGURE_ENV+= ENABLELDAPSSL=y 108CONFIGURE_ENV+= ENABLELDAPSSL=y
109CONFIGURE_ENV+= LDAPINC=${BUILDLINK_PREFIX.openldap-client}/include 109CONFIGURE_ENV+= LDAPINC=${BUILDLINK_PREFIX.openldap-client}/include
110CONFIGURE_ENV+= LDAPLIB=${BUILDLINK_PREFIX.openldap-client}/lib 110CONFIGURE_ENV+= LDAPLIB=${BUILDLINK_PREFIX.openldap-client}/lib
111CONFIGURE_ENV+= PCREINC=${BUILDLINK_PREFIX.pcre}/include 111CONFIGURE_ENV+= PCREINC=${BUILDLINK_PREFIX.pcre}/include
112CONFIGURE_ENV+= PCRELIB=${BUILDLINK_PREFIX.pcre}/lib 112CONFIGURE_ENV+= PCRELIB=${BUILDLINK_PREFIX.pcre}/lib
113CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q} 113CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q}
114CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q} 114CONFIGURE_ENV+= XYMONHOSTIP=${XYMONSERVERIP:Q}
115CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q} 115CONFIGURE_ENV+= XYMONUSER=${XYMONUSER:Q}
cvs diff -r1.3 -r1.4 pkgsrc/net/xymon/distinfo (expand / switch to unified diff)

--- pkgsrc/net/xymon/distinfo 2011/10/15 16:28:22 1.3
+++ pkgsrc/net/xymon/distinfo 2011/10/15 18:09:28 1.4
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.3 2011/10/15 16:28:22 dholland Exp $ 1$NetBSD: distinfo,v 1.4 2011/10/15 18:09:28 dholland Exp $
2 2
3SHA1 (xymon-4.3.2.tar.gz) = 6663470565545d1801d2ff05cab78bc89695a821 3SHA1 (xymon-4.3.2.tar.gz) = 6663470565545d1801d2ff05cab78bc89695a821
4RMD160 (xymon-4.3.2.tar.gz) = 45b75a7d3b8a57518aa12f12ee36c6de6de96aae 4RMD160 (xymon-4.3.2.tar.gz) = 45b75a7d3b8a57518aa12f12ee36c6de6de96aae
5Size (xymon-4.3.2.tar.gz) = 2698224 bytes 5Size (xymon-4.3.2.tar.gz) = 2698224 bytes
6SHA1 (patch-aa) = aa0634088b82ad045435321e354d39923c67873e 6SHA1 (patch-aa) = aa0634088b82ad045435321e354d39923c67873e
7SHA1 (patch-ab) = 9a8edca943211101f387e5a21d638d44a23cf6a7 7SHA1 (patch-ab) = 9a8edca943211101f387e5a21d638d44a23cf6a7
8SHA1 (patch-ac) = c894c809ec4584636bb9705a521a0208dc2dbc05 8SHA1 (patch-ac) = c894c809ec4584636bb9705a521a0208dc2dbc05
9SHA1 (patch-ad) = dadd2d81ed55c70f03994b2d868cfe643969a8ba 9SHA1 (patch-ad) = 5073ccab556b2b6c787bcc640cd4c8b112f0c97d
10SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5 10SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
11SHA1 (patch-af) = d486344e3f7fe05f61ea8ec0f811052a56ceb52f 11SHA1 (patch-af) = d486344e3f7fe05f61ea8ec0f811052a56ceb52f
12SHA1 (patch-ah) = 152d3b993559b349f241e0a2f6419721bfb3c4b3 12SHA1 (patch-ah) = 152d3b993559b349f241e0a2f6419721bfb3c4b3
13SHA1 (patch-configure) = 36a968ab13bdbf80a6c9e950624b38ae4eb2d019 
cvs diff -r1.3 -r1.4 pkgsrc/net/xymon/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/xymon/patches/patch-ad 2011/10/15 16:28:22 1.3
+++ pkgsrc/net/xymon/patches/patch-ad 2011/10/15 18:09:28 1.4
@@ -1,31 +1,13 @@ @@ -1,31 +1,13 @@
1$NetBSD: patch-ad,v 1.3 2011/10/15 16:28:22 dholland Exp $ 1$NetBSD: patch-ad,v 1.4 2011/10/15 18:09:28 dholland Exp $
2 
3- netbsd has stdint.h 
4- remove stray commas 
5 2
6--- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000 3--- build/Makefile.NetBSD.orig 2011-03-08 17:20:28.000000000 +0000
7+++ build/Makefile.NetBSD 4+++ build/Makefile.NetBSD
8@@ -1,7 +1,7 @@ 5@@ -1,7 +1,7 @@
9 # Xymon compile-time settings for NetBSD systems 6 # Xymon compile-time settings for NetBSD systems
10 # From Emmanuel Dreyfus. 7 # From Emmanuel Dreyfus.
11 # 8 #
12-OSDEF = -DBSD 9-OSDEF = -DBSD
13+OSDEF = -DBSD -DHAVE_STDINT_H 10+OSDEF = -DBSD -DHAVE_STDINT_H
14  11
15 # NETLIBS: None needed 12 # NETLIBS: None needed
16 NETLIBS = 13 NETLIBS =
17@@ -10,12 +10,12 @@ NETLIBS = 
18 CC= gcc 
19 PKGDIR?=/usr/pkg 
20 CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \ 
21- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 
22+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib 
23 RPATH = "-Wl,--rpath," 
24  
25 # Compile flags for debugging 
26 # CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) \ 
27- -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib 
28+ -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib 
29  
30 # 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" 
File Deleted: pkgsrc/net/xymon/patches/patch-configure