xymon: Use pkgsrc/system c-ares instead of bundled.

Fixes build on systems that happen to put link libraries in LDFLAGS due to
incredibly strict configure script.  Bump PKGREVISION.

3 files changed, 22 insertions, 10 deletions

diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index c579125bc3b..a344a3d277c 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2022/11/23 16:20:56 adam Exp $
+# $NetBSD: Makefile,v 1.70 2022/12/07 08:15:59 jperkin Exp $
 #
 
 DISTNAME=		xymon-4.3.30
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xymon/}
 
@@ -90,6 +90,8 @@ MESSAGE_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=		SECCGIDIR=${SECCGIDIR}
 
 CONFIGURE_ARGS+=	"--server"
+CONFIGURE_ARGS+=	"--caresinclude" "${BUILDLINK_PREFIX.libcares}/include"
+CONFIGURE_ARGS+=	"--careslib" "${BUILDLINK_PREFIX.libcares}/lib"
 CONFIGURE_ARGS+=	"--rrdinclude" "${BUILDLINK_PREFIX.rrdtool}/include"
 CONFIGURE_ARGS+=	"--rrdlib" "${BUILDLINK_PREFIX.rrdtool}/lib"
 CONFIGURE_ARGS+=	"--pngconfig" "${BUILDLINK_PREFIX.png}/bin/libpng-config"
@@ -218,6 +220,7 @@ post-install:
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../net/libcares/buildlink3.mk"
 .include "../../mk/apache.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xymon/distinfo b/net/xymon/distinfo
index a50c0473263..7120938f4a8 100644
--- a/net/xymon/distinfo
+++ b/net/xymon/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 11:07:13 nia Exp $
+$NetBSD: distinfo,v 1.22 2022/12/07 08:15:59 jperkin Exp $
 
 BLAKE2s (xymon-4.3.30.tar.gz) = 03a385a0e32188d4ca6fdbaa55bbb92d053ec706ee70ca0bcf483c3f5611a85f
 SHA512 (xymon-4.3.30.tar.gz) = f3f16ff55293d7d76cb0355151a82545a2b1ad708b59c031640c240379807228dca4ffa9c48a4e20ab75e270bda18b7306ea165b65eb18c9c6471b395fda7b62
 Size (xymon-4.3.30.tar.gz) = 3549653 bytes
-SHA1 (patch-aa) = 227b631c6e002712ebf6019d8473ca4b44904e4a
+SHA1 (patch-aa) = 7a1455860d5a65aec4b2c226400bf33afc01b78a
 SHA1 (patch-ab) = 39a6af51ec216bb8cbdb57a3c07d82fce559b27f
 SHA1 (patch-ac) = 518abacafb7f082ab2de6bcaace27d3e3d4de633
 SHA1 (patch-ad) = 4b5413ee14d035fb1b588207b86ebaf0ac122951
diff --git a/net/xymon/patches/patch-aa b/net/xymon/patches/patch-aa
index 6378580fd5f..e57ec29b016 100644
--- a/net/xymon/patches/patch-aa
+++ b/net/xymon/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
+$NetBSD: patch-aa,v 1.6 2022/12/07 08:15:59 jperkin Exp $
 
 add extra options for cases where PREFIX is not in a standard location
 
 add INSTALLEXADIR for some pkgsrc magic
 
-$NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
+$NetBSD: patch-aa,v 1.6 2022/12/07 08:15:59 jperkin Exp $
 
---- configure.server.orig	2014-01-26 12:39:20.000000000 +0000
+--- configure.server.orig	2019-04-22 18:20:02.000000000 +0000
 +++ configure.server
 @@ -17,6 +17,8 @@ do
    To configure Xymon, the following options are available:
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
  	  "--fping")
  	  	USERFPING="$1"; shift
  		;;
-@@ -400,14 +412,16 @@ then
+@@ -404,14 +416,16 @@ then
  fi
  echo ""; echo ""
  
@@ -67,7 +67,16 @@ $NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
  echo "# Server data dir for hist/ etc."  >>Makefile
  echo "XYMONVAR = $XYMONVAR"              >>Makefile
  echo "# CGI scripts go in CGIDIR"        >>Makefile
-@@ -527,6 +541,7 @@ echo "LIBRTDEF = $LIBRTDEF"             
+@@ -453,7 +467,7 @@ then
+ 	echo "CARESINCDIR = -I$CARESINC" >>Makefile
+     fi
+     if test "$CARESLIB" != ""; then
+-	echo "CARESLIBS = -L$LIB -lcares" >>Makefile
++	echo "CARESLIBS = -L$CARESLIB -lcares" >>Makefile
+ 	echo "RPATHVAL += ${LIB}"        >>Makefile
+     else
+ 	echo "CARESLIBS = -lcares"       >>Makefile
+@@ -531,6 +545,7 @@ echo "LIBRTDEF = $LIBRTDEF"
  echo ""                                  >>Makefile
  echo "# Net-SNMP settings"               >>Makefile
  echo "DOSNMP = $DOSNMP"                  >>Makefile
@@ -75,7 +84,7 @@ $NetBSD: patch-aa,v 1.5 2014/02/27 20:22:41 spz Exp $
  echo ""                                  >>Makefile
  
  echo "# Large File Support settings"     >>Makefile
-@@ -557,6 +572,9 @@ fi
+@@ -561,6 +576,9 @@ fi
  if test "$INSTALLETCDIR" != ""; then
  	echo "INSTALLETCDIR = $INSTALLETCDIR"   >>Makefile
  fi