CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jun  1 18:41:26 UTC 2025

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

Log Message:
*: revert most recent commit

Related thread:
https://mail-index.netbsd.org/pkgsrc-changes/2025/06/01/msg324963.html


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/nagios-plugins/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/srsh/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/keychain/Makefile
cvs rdiff -u -r1.21 -r1.22 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.60 pkgsrc/net/nagios-plugins/Makefile:1.61
--- pkgsrc/net/nagios-plugins/Makefile:1.60     Sun Jun  1 10:58:55 2025
+++ pkgsrc/net/nagios-plugins/Makefile  Sun Jun  1 18:41:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2025/06/01 10:58:55 vins Exp $
+# $NetBSD: Makefile,v 1.61 2025/06/01 18:41:25 vins Exp $
 
 PKGREVISION=   2
 CATEGORIES=    net sysutils
@@ -50,6 +50,10 @@ 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
@@ -77,6 +81,5 @@ 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.17 pkgsrc/net/srsh/Makefile:1.18
--- pkgsrc/net/srsh/Makefile:1.17       Sun Jun  1 10:58:55 2025
+++ pkgsrc/net/srsh/Makefile    Sun Jun  1 18:41:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2025/06/01 10:58:55 vins Exp $
+# $NetBSD: Makefile,v 1.18 2025/06/01 18:41:25 vins Exp $
 #
 
 DISTNAME=              srsh-1.3
@@ -8,9 +8,12 @@ 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/security/keychain/Makefile
diff -u pkgsrc/security/keychain/Makefile:1.43 pkgsrc/security/keychain/Makefile:1.44
--- pkgsrc/security/keychain/Makefile:1.43      Sun Jun  1 09:50:26 2025
+++ pkgsrc/security/keychain/Makefile   Sun Jun  1 18:41:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2025/06/01 09:50:26 vins Exp $
+# $NetBSD: Makefile,v 1.44 2025/06/01 18:41:25 vins Exp $
 
 DISTNAME=      keychain-2.9.5
 PKGREVISION=   1
@@ -14,6 +14,10 @@ USE_TOOLS+=  groff perl:build pod2man
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !exists(/usr/bin/ssh)
+DEPENDS+=      openssh-[0-9]*:../../security/openssh
+.endif
+
 .if exists(${X11BASE}/bin/ssh-askpass)
 ASKPASS_PROGRAM=       ${X11BASE}/bin/ssh-askpass
 .elif exists(/usr/libexec/ssh-askpass)
@@ -34,5 +38,4 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md     \
                ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
-.include "../../security/openssh/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/backuppc/Makefile
diff -u pkgsrc/sysutils/backuppc/Makefile:1.21 pkgsrc/sysutils/backuppc/Makefile:1.22
--- pkgsrc/sysutils/backuppc/Makefile:1.21      Sun Jun  1 10:58:55 2025
+++ pkgsrc/sysutils/backuppc/Makefile   Sun Jun  1 18:41:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2025/06/01 10:58:55 vins Exp $
+# $NetBSD: Makefile,v 1.22 2025/06/01 18:41:26 vins Exp $
 
 DISTNAME=      BackupPC-4.4.0
 PKGREVISION=   4
@@ -63,7 +63,13 @@ 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
-CONFIGURE_ARGS+=       --bin-path ssh=${OPENSSH:Q}
+
+.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
 
 BUILD_DEFS+=           BACKUPPC_USER BACKUPPC_GROUP APACHE_USER APACHE_GROUP VARBASE
 
@@ -126,5 +132,4 @@ 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"