Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=Ag8oPFGh; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=Sfh+UUop Received: by mail.netbsd.org (Postfix, from userid 605) id 8BF2584E6B; Mon, 11 Mar 2024 10:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1710154051; bh=IHYvEFWud5R5WPGn4eBOL1AfF0kDaSnAlJov2cazAyU=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=Ag8oPFGhLzRVB+n90We5+W9kN2+aHevLltcRlNgvk8BURYJygGNjblLyJ1ncNVTHG M3ARKoqRi0XIx2myhoNvDIbAcXxhaD9HeBh/KH+6KMoaYmw5EwBeCOiweJAiHqH+mT 6D5MvWwveVR9vEzqcuNrpWHiatplqBPLj75D9nKw= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7D0D684E5A for ; Mon, 11 Mar 2024 10:47:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id JelV4p-csjAa for ; Mon, 11 Mar 2024 10:47:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D830284CFC for ; Mon, 11 Mar 2024 10:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1710154049; bh=IHYvEFWud5R5WPGn4eBOL1AfF0kDaSnAlJov2cazAyU=; h=Date:From:Subject:To:Reply-To; b=Sfh+UUopBuc4ut+Elf5UGPEUtLjJnwqE+rlGlukhuJpKLX6M3f+vc1W0QTRF+JMzx uvi0l1zGQZs66aD6ZqjQika29wXL4UXUOpNz4Z2S4emfyyBCyNhiklMPtxyAxb3TKc 1zKS2cSYDTvNPnWV0NhNoeXs9mHkOcrrrZuq33v8= Received: by cvs.NetBSD.org (Postfix, from userid 500) id CDDA7FA2C; Mon, 11 Mar 2024 10:47:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1710154049219680" MIME-Version: 1.0 Date: Mon, 11 Mar 2024 10:47:29 +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: <20240311104729.CDDA7FA2C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1710154049219680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Mar 11 10:47:29 UTC 2024 Modified Files: pkgsrc/net/xymon: Makefile distinfo Added Files: pkgsrc/net/xymon/patches: patch-build_c-ares.sh Log Message: xymon: Further fixes to use system c-ares. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 pkgsrc/net/xymon/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/xymon/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/xymon/patches/patch-build_c-ares.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1710154049219680 Content-Disposition: inline Content-Length: 2929 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.76 pkgsrc/net/xymon/Makefile:1.77 --- pkgsrc/net/xymon/Makefile:1.76 Tue Nov 14 14:02:42 2023 +++ pkgsrc/net/xymon/Makefile Mon Mar 11 10:47:29 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2023/11/14 14:02:42 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2024/03/11 10:47:29 jperkin Exp $ # DISTNAME= xymon-4.3.30 @@ -128,6 +128,11 @@ SUBST_FILES.bashpath= xymond/xymonreport SUBST_SED.bashpath= -e 's,/bin/bash,'${BASH:Q}',' SUBST_STAGE.bashpath= pre-configure +SUBST_CLASSES+= vars +SUBST_STAGE.vars= pre-configure +SUBST_FILES.vars= build/c-ares.sh +SUBST_VARS.vars= COMPILER_RPATH_FLAG + USE_TOOLS+= awk:run cat:run cp:run USE_TOOLS+= cut:run date:run egrep:run USE_TOOLS+= expr:run find:run grep:run Index: pkgsrc/net/xymon/distinfo diff -u pkgsrc/net/xymon/distinfo:1.22 pkgsrc/net/xymon/distinfo:1.23 --- pkgsrc/net/xymon/distinfo:1.22 Wed Dec 7 08:15:59 2022 +++ pkgsrc/net/xymon/distinfo Mon Mar 11 10:47:29 2024 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2022/12/07 08:15:59 jperkin Exp $ +$NetBSD: distinfo,v 1.23 2024/03/11 10:47:29 jperkin Exp $ BLAKE2s (xymon-4.3.30.tar.gz) = 03a385a0e32188d4ca6fdbaa55bbb92d053ec706ee70ca0bcf483c3f5611a85f SHA512 (xymon-4.3.30.tar.gz) = f3f16ff55293d7d76cb0355151a82545a2b1ad708b59c031640c240379807228dca4ffa9c48a4e20ab75e270bda18b7306ea165b65eb18c9c6471b395fda7b62 @@ -21,6 +21,7 @@ SHA1 (patch-build_Makefile.OSX) = a72b74 SHA1 (patch-build_Makefile.OpenBSD) = cf40c7839ba6290d349328e2e01a20bdaf274fc6 SHA1 (patch-build_Makefile.SunOS) = 71d134a30825a2d36fbb17731e722c89c79da807 SHA1 (patch-build_Makefile.generic) = e96d5ee29630c9133caebfa752880be90726607c +SHA1 (patch-build_c-ares.sh) = c958992639b45431056d91939a345e703131ca2d SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707 Added files: Index: pkgsrc/net/xymon/patches/patch-build_c-ares.sh diff -u /dev/null pkgsrc/net/xymon/patches/patch-build_c-ares.sh:1.1 --- /dev/null Mon Mar 11 10:47:29 2024 +++ pkgsrc/net/xymon/patches/patch-build_c-ares.sh Mon Mar 11 10:47:29 2024 @@ -0,0 +1,15 @@ +$NetBSD: patch-build_c-ares.sh,v 1.1 2024/03/11 10:47:29 jperkin Exp $ + +Link against c-ares library correctly. + +--- build/c-ares.sh.orig 2024-03-11 10:39:55.043372385 +0000 ++++ build/c-ares.sh +@@ -42,7 +42,7 @@ + CARESOK="YES" + cd build + if test "$CARESINC" != ""; then INCOPT="-I$CARESINC"; fi +- if test "$CARESLIB" != ""; then LIBOPT="-L$CARESLIB"; fi ++ if test "$CARESLIB" != ""; then LIBOPT="@COMPILER_RPATH_FLAG@$CARESLIB -L$CARESLIB"; fi + OS=`uname -s | sed -e's@/@_@g'` $MAKE -f Makefile.test-cares ares-clean + OS=`uname -s | sed -e's@/@_@g'` CARESINC="$INCOPT" $MAKE -f Makefile.test-cares test-compile + if test $? -eq 0; then --_----------=_1710154049219680--