CVS commit: pkgsrc/net/xymon

["Tobias Nygren" <tnn%netbsd.org@localhost>]

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.

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}