[pkgsrc/trunk]: pkgsrc/net/xymon xymon: fix dependency pattern for xymonclien...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/960ce42e9748
branches:  trunk
changeset: 383758:960ce42e9748
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Aug 22 15:22:14 2022 +0000

description:
xymon: fix dependency pattern for xymonclient + pkglint

diffstat:

 net/xymon/DEINSTALL |   3 +--
 net/xymon/Makefile  |  10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r 3a4e231a3b6a -r 960ce42e9748 net/xymon/DEINSTALL
--- a/net/xymon/DEINSTALL       Mon Aug 22 15:20:35 2022 +0000
+++ b/net/xymon/DEINSTALL       Mon Aug 22 15:22:14 2022 +0000
@@ -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 @@
 
        ;;
 esac
-
diff -r 3a4e231a3b6a -r 960ce42e9748 net/xymon/Makefile
--- a/net/xymon/Makefile        Mon Aug 22 15:20:35 2022 +0000
+++ b/net/xymon/Makefile        Mon Aug 22 15:22:14 2022 +0000
@@ -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+=            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+=       "--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}