Fix most of xymon's build issues:

   - use the right environment variable to pass the rrdtool location;
   - remove some stray commas from the NetBSD build config;
   - make the toplevel configure script stop on error.

4 files changed, 45 insertions, 6 deletions

diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index dcab412e1c2..b35202358b9 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/04/22 17:34:20 spz Exp $
+# $NetBSD: Makefile,v 1.10 2011/10/15 16:28:22 dholland Exp $
 #
 
 DISTNAME=		xymon-4.3.2
@@ -98,8 +98,8 @@ CONFIGURE_ARGS+=	"--server"
 
 CONFIGURE_ENV+=		USERFPING=${PREFIX.fping}/sbin/fping
 CONFIGURE_ENV+=		USEXYMONPING=n
-CONFIGURE_ENV+=		RRDINC=${BUILDLINK_PREFIX.rrdtool}/include
-CONFIGURE_ENV+=		RRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a
+CONFIGURE_ENV+=		USERRRDINC=${BUILDLINK_PREFIX.rrdtool}/include
+CONFIGURE_ENV+=		USERRRDLIB=${BUILDLINK_PREFIX.rrdtool}/lib/librrd.a
 CONFIGURE_ENV+=		PNGLIB=${BUILDLINK_PREFIX.png}/lib/libpng.a
 CONFIGURE_ENV+=		ENABLESSL=y
 CONFIGURE_ENV+=		OSSLINC=${BUILDLINK_PREFIX.openssl}/include
diff --git a/net/xymon/distinfo b/net/xymon/distinfo
index 1c77a6cfd73..f83f36647f4 100644
--- a/net/xymon/distinfo
+++ b/net/xymon/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/04/22 14:52:18 spz Exp $
+$NetBSD: distinfo,v 1.3 2011/10/15 16:28:22 dholland Exp $
 
 SHA1 (xymon-4.3.2.tar.gz) = 6663470565545d1801d2ff05cab78bc89695a821
 RMD160 (xymon-4.3.2.tar.gz) = 45b75a7d3b8a57518aa12f12ee36c6de6de96aae
@@ -6,7 +6,8 @@ Size (xymon-4.3.2.tar.gz) = 2698224 bytes
 SHA1 (patch-aa) = aa0634088b82ad045435321e354d39923c67873e
 SHA1 (patch-ab) = 9a8edca943211101f387e5a21d638d44a23cf6a7
 SHA1 (patch-ac) = c894c809ec4584636bb9705a521a0208dc2dbc05
-SHA1 (patch-ad) = 5073ccab556b2b6c787bcc640cd4c8b112f0c97d
+SHA1 (patch-ad) = dadd2d81ed55c70f03994b2d868cfe643969a8ba
 SHA1 (patch-ae) = aa29eefcf9f0fa87014166692dcf146cebd70ef5
 SHA1 (patch-af) = d486344e3f7fe05f61ea8ec0f811052a56ceb52f
 SHA1 (patch-ah) = 152d3b993559b349f241e0a2f6419721bfb3c4b3
+SHA1 (patch-configure) = 36a968ab13bdbf80a6c9e950624b38ae4eb2d019
diff --git a/net/xymon/patches/patch-ad b/net/xymon/patches/patch-ad
index dd81912f9fb..afa3b02aaa7 100644
--- a/net/xymon/patches/patch-ad
+++ b/net/xymon/patches/patch-ad
@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2011/04/22 14:52:18 spz Exp $
+$NetBSD: patch-ad,v 1.3 2011/10/15 16:28:22 dholland Exp $
+
+- netbsd has stdint.h
+- remove stray commas
 
 --- build/Makefile.NetBSD.orig	2011-03-08 17:20:28.000000000 +0000
 +++ build/Makefile.NetBSD
@@ -11,3 +14,18 @@ $NetBSD: patch-ad,v 1.2 2011/04/22 14:52:18 spz Exp $
  
  # NETLIBS: None needed
  NETLIBS =
+@@ -10,12 +10,12 @@ NETLIBS =
+ CC= gcc
+ PKGDIR?=/usr/pkg
+ CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
+-       -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
++       -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
+ RPATH = "-Wl,--rpath,"
+ 
+ # Compile flags for debugging
+ # CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) \
+-       -I${PKGDIR}/include -L${PKGDIR}/lib, -Wl,--rpath=${PKGDIR}/lib
++       -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
+ 
+ # Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject
+ # Typically, this will be "mail" or "mailx"
diff --git a/net/xymon/patches/patch-configure b/net/xymon/patches/patch-configure
new file mode 100644
index 00000000000..68b1a82d45a
--- /dev/null
+++ b/net/xymon/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2011/10/15 16:28:22 dholland Exp $
+
+Make sure the toplevel configure script exits on failure.
+
+--- configure~	2011-03-08 17:20:28.000000000 +0000
++++ configure
+@@ -14,11 +14,11 @@ chmod 755 $BASEDIR/configure* $BASEDIR/b
+ 
+ case "$TARGET" in
+   "--client")
+-	$BASEDIR/configure.client $*
++	$BASEDIR/configure.client "$@" || exit 1
+ 	;;
+ 
+   "--server"|"")
+-	$BASEDIR/configure.server $*
++	$BASEDIR/configure.server "$@" || exit 1
+ 	;;
+ 
+   "--help")