Received: by mail.netbsd.org (Postfix, from userid 605) id 61C4B84D55; Mon, 22 Aug 2022 15:22:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9B61B84D2D for ; Mon, 22 Aug 2022 15:22:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jxUOYJ2DSemV for ; Mon, 22 Aug 2022 15:22:15 +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 1B79684D22 for ; Mon, 22 Aug 2022 15:22:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1067DFB1A; Mon, 22 Aug 2022 15:22:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1661181735123460" MIME-Version: 1.0 Date: Mon, 22 Aug 2022 15:22:15 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/net/xymon To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220822152215.1067DFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1661181735123460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Aug 22 15:22:14 UTC 2022 Modified Files: pkgsrc/net/xymon: DEINSTALL Makefile Log Message: xymon: fix dependency pattern for xymonclient + pkglint To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/xymon/DEINSTALL cvs rdiff -u -r1.67 -r1.68 pkgsrc/net/xymon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1661181735123460 Content-Disposition: inline Content-Length: 1782 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/xymon/DEINSTALL diff -u pkgsrc/net/xymon/DEINSTALL:1.2 pkgsrc/net/xymon/DEINSTALL:1.3 --- pkgsrc/net/xymon/DEINSTALL:1.2 Fri Apr 22 14:52:18 2011 +++ pkgsrc/net/xymon/DEINSTALL Mon Aug 22 15:22:14 2022 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: DEINSTALL,v 1.2 2011/04/22 14:52:18 spz Exp $ +# $NetBSD: DEINSTALL,v 1.3 2022/08/22 15:22:14 tnn Exp $ # # xymons user/group @@ -166,4 +166,3 @@ DEINSTALL) ;; esac - Index: pkgsrc/net/xymon/Makefile diff -u pkgsrc/net/xymon/Makefile:1.67 pkgsrc/net/xymon/Makefile:1.68 --- pkgsrc/net/xymon/Makefile:1.67 Mon Apr 18 19:11:55 2022 +++ pkgsrc/net/xymon/Makefile Mon Aug 22 15:22:14 2022 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.67 2022/04/18 19:11:55 adam Exp $ +# $NetBSD: Makefile,v 1.68 2022/08/22 15:22:14 tnn Exp $ # DISTNAME= xymon-4.3.30 -#PKGREVISION= 0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} @@ -18,8 +17,7 @@ CONFLICTS+= hobbitmon-[0-9]* CONFLICTS+= hobbitclient-[0-9]* DEPENDS+= fping>=2:../../net/fping - # xymonclient ought to be the same version as the server, modulo nbN -DEPENDS+= xymonclient>=4.3.0b2:../../net/xymonclient +DEPENDS+= xymonclient-${PKGVERSION_NOREV}{,nb*}:../../net/xymonclient HAS_CONFIGURE= YES USE_TOOLS+= gmake @@ -97,7 +95,7 @@ CONFIGURE_ARGS+= "--rrdlib" "${BUILDLINK CONFIGURE_ARGS+= "--pngconfig" "${BUILDLINK_PREFIX.png}/bin/libpng-config" CONFIGURE_ARGS+= "--pcreinclude" "${BUILDLINK_PREFIX.pcre}/include" CONFIGURE_ARGS+= "--pcrelib" "${BUILDLINK_PREFIX.pcre}/lib" -CONFIGURE_ARGS+= "--fping" "${LOCALBASE}/sbin/fping" +CONFIGURE_ARGS+= "--fping" "${PREFIX}/sbin/fping" CONFIGURE_ENV+= USEXYMONPING=n CONFIGURE_ENV+= XYMONHOSTNAME=${XYMONSERVERNAME:Q} --_----------=_1661181735123460--