Received: by mail.netbsd.org (Postfix, from userid 605) id BD4B284EF8; Wed, 7 Dec 2022 08:16:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EEC1F84E5D for ; Wed, 7 Dec 2022 08:16:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gZyzWpjO4TEn for ; Wed, 7 Dec 2022 08:16:00 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1AE6D84D08 for ; Wed, 7 Dec 2022 08:16:00 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 145B1FA90; Wed, 7 Dec 2022 08:16:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1670400960103570" MIME-Version: 1.0 Date: Wed, 7 Dec 2022 08:16:00 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/net/xymon To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20221207081600.145B1FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1670400960103570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Dec 7 08:15:59 UTC 2022 Modified Files: pkgsrc/net/xymon: Makefile distinfo pkgsrc/net/xymon/patches: patch-aa Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/xymon/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/xymon/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/xymon/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1670400960103570 Content-Disposition: inline Content-Length: 4411 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/xymon/Makefile diff -u pkgsrc/net/xymon/Makefile:1.69 pkgsrc/net/xymon/Makefile:1.70 --- pkgsrc/net/xymon/Makefile:1.69 Wed Nov 23 16:20:56 2022 +++ pkgsrc/net/xymon/Makefile Wed Dec 7 08:15:59 2022 @@ -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" Index: pkgsrc/net/xymon/distinfo diff -u pkgsrc/net/xymon/distinfo:1.21 pkgsrc/net/xymon/distinfo:1.22 --- pkgsrc/net/xymon/distinfo:1.21 Tue Oct 26 11:07:13 2021 +++ pkgsrc/net/xymon/distinfo Wed Dec 7 08:15:59 2022 @@ -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 Index: pkgsrc/net/xymon/patches/patch-aa diff -u pkgsrc/net/xymon/patches/patch-aa:1.5 pkgsrc/net/xymon/patches/patch-aa:1.6 --- pkgsrc/net/xymon/patches/patch-aa:1.5 Thu Feb 27 20:22:41 2014 +++ pkgsrc/net/xymon/patches/patch-aa Wed Dec 7 08:15:59 2022 @@ -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 "--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 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 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 --_----------=_1670400960103570--