CVS commit: pkgsrc

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jun  1 10:58:55 UTC 2025

Modified Files:
        pkgsrc/net/nagios-plugins: Makefile
        pkgsrc/net/srsh: Makefile
        pkgsrc/sysutils/backuppc: Makefile

Log Message:
*: pull openssh using the buildink framework


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/net/nagios-plugins/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/srsh/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/backuppc/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/nagios-plugins/Makefile
diff -u pkgsrc/net/nagios-plugins/Makefile:1.59 pkgsrc/net/nagios-plugins/Makefile:1.60
--- pkgsrc/net/nagios-plugins/Makefile:1.59     Fri Jan  5 01:58:52 2024
+++ pkgsrc/net/nagios-plugins/Makefile  Sun Jun  1 10:58:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2024/01/05 01:58:52 taca Exp $
+# $NetBSD: Makefile,v 1.60 2025/06/01 10:58:55 vins Exp $
 
 PKGREVISION=   2
 CATEGORIES=    net sysutils
@@ -50,10 +50,6 @@ MAKE_ENV+=           CPPFLAGS_LFS=${CPPFLAGS_LFS:
 .endif
 LIBS.SunOS+=           -lm
 
-.if !exists(/usr/bin/ssh)
-DEPENDS+=      {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
-.endif
-
 .if (!exists(/usr/bin/dig) && !exists(/usr/sbin/dig)) || \
     (!exists(/usr/bin/nslookup) && !exists(/usr/sbin/nslookup))
 DEPENDS+=      bind-[0-9]*:../../net/bind918
@@ -81,5 +77,6 @@ post-install:
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../security/openssh/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/srsh/Makefile
diff -u pkgsrc/net/srsh/Makefile:1.16 pkgsrc/net/srsh/Makefile:1.17
--- pkgsrc/net/srsh/Makefile:1.16       Tue Dec 19 12:32:24 2023
+++ pkgsrc/net/srsh/Makefile    Sun Jun  1 10:58:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/12/19 12:32:24 zafer Exp $
+# $NetBSD: Makefile,v 1.17 2025/06/01 10:58:55 vins Exp $
 #
 
 DISTNAME=              srsh-1.3
@@ -8,12 +8,9 @@ MASTER_SITES=          https://software.kimmo.su
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 COMMENT=               Emulate rsh client behavior using ssh
 
-.if !exists(/usr/bin/ssh)
-DEPENDS+=              {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
-.endif
-
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 NO_CONFIGURE=          yes
 MAKE_FLAGS+=           PREFIX=${PREFIX}
 
+.include "../../security/openssh/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/backuppc/Makefile
diff -u pkgsrc/sysutils/backuppc/Makefile:1.20 pkgsrc/sysutils/backuppc/Makefile:1.21
--- pkgsrc/sysutils/backuppc/Makefile:1.20      Mon Jul  3 13:08:12 2023
+++ pkgsrc/sysutils/backuppc/Makefile   Sun Jun  1 10:58:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/07/03 13:08:12 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2025/06/01 10:58:55 vins Exp $
 
 DISTNAME=      BackupPC-4.4.0
 PKGREVISION=   4
@@ -63,13 +63,7 @@ CONFIGURE_ARGS+=     --bin-path nmblookup=${
 CONFIGURE_ARGS+=       --bin-path smbclient=${PREFIX}/bin/smbclient
 CONFIGURE_ARGS+=       --bin-path par2=${PREFIX}/bin/par2
 CONFIGURE_ARGS+=       --bin-path rsync_bpc=${PREFIX}/bin/rsync_bpc
-
-.if exists(/usr/bin/ssh)
-CONFIGURE_ARGS+=       --bin-path ssh=/usr/bin/ssh
-.else
-DEPENDS+=              openssh-[0-9]*:../../security/openssh
-CONFIGURE_ARGS+=       --bin-path ssh=${PREFIX}/bin/ssh
-.endif
+CONFIGURE_ARGS+=       --bin-path ssh=${OPENSSH:Q}
 
 BUILD_DEFS+=           BACKUPPC_USER BACKUPPC_GROUP APACHE_USER APACHE_GROUP VARBASE
 
@@ -132,4 +126,5 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/cgiwrapper.c ${DESTDIR}${PREFIX}/share/examples/BackupPC/cgiwrapper.c
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/openssh/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"