From 73b404917ac9505c5c44db74a1e2b9e6653482cb Mon Sep 17 00:00:00 2001
From: spz <spz>
Date: Sat, 15 Oct 2011 23:04:51 +0000
Subject: [PATCH] reanimate dhollands changes that play ok with 4.3.5

---
 net/xymon/patches/patch-ad              | 20 +++++++++++++++++-
 net/xymon/patches/patch-configure       | 20 ++++++++++++++++++
 net/xymonclient/patches/patch-ae        | 27 ++++++++++++++++++++-----
 net/xymonclient/patches/patch-configure | 20 ++++++++++++++++++
 4 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 net/xymon/patches/patch-configure
 create mode 100644 net/xymonclient/patches/patch-configure

diff --git a/net/xymon/patches/patch-ad b/net/xymon/patches/patch-ad
index 39668ba4d785b..5106dc86d242a 100644
--- a/net/xymon/patches/patch-ad
+++ b/net/xymon/patches/patch-ad
@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2011/10/15 18:09:28 dholland Exp $
+$NetBSD: patch-ad,v 1.5 2011/10/15 23:04:51 spz 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.4 2011/10/15 18:09:28 dholland 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 0000000000000..9083431866681
--- /dev/null
+++ b/net/xymon/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.3 2011/10/15 23:04:51 spz Exp $
+
+Make sure the toplevel configure script exits on failure.
+
+--- configure.orig	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")
diff --git a/net/xymonclient/patches/patch-ae b/net/xymonclient/patches/patch-ae
index f9ceca88fdc3b..7cbb622692446 100644
--- a/net/xymonclient/patches/patch-ae
+++ b/net/xymonclient/patches/patch-ae
@@ -1,14 +1,31 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/02/14 16:11:11 spz Exp $
+$NetBSD: patch-ae,v 1.2 2011/10/15 23:04:51 spz Exp $
 
---- build/Makefile.NetBSD.orig	2010-02-08 23:58:57.000000000 +0000
+- netbsd has stdint.h
+- remove stray commas
+
+--- build/Makefile.NetBSD.orig	2011-03-08 17:20:28.000000000 +0000
 +++ build/Makefile.NetBSD
-@@ -10,7 +10,8 @@ NETLIBS =
+@@ -1,7 +1,7 @@
+ # Xymon compile-time settings for NetBSD systems
+ # From Emmanuel Dreyfus.
+ #
+-OSDEF = -DBSD
++OSDEF = -DBSD -DHAVE_STDINT_H
+ 
+ # 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 \
-+       -DHAVE_STDINT_H
++       -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/xymonclient/patches/patch-configure b/net/xymonclient/patches/patch-configure
new file mode 100644
index 0000000000000..193110b3a49ee
--- /dev/null
+++ b/net/xymonclient/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2011/10/15 23:04:51 spz Exp $
+
+Make sure the toplevel configure script exits on failure.
+
+--- configure.orig	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")