CVS commit: pkgsrc/pkgtools/pkgchkxx

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May  9 15:41:49 UTC 2025

Modified Files:
        pkgsrc/pkgtools/pkgchkxx: Makefile

Log Message:
pkgchkxx: handle the case when pkgtools from pkgsrc is already installed

Since PKGTOOLS_VERSION will be up-to-date in that case, the configure
script could end up detecting pkg_install from base.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/pkgtools/pkgchkxx/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkgchkxx/Makefile
diff -u pkgsrc/pkgtools/pkgchkxx/Makefile:1.14 pkgsrc/pkgtools/pkgchkxx/Makefile:1.15
--- pkgsrc/pkgtools/pkgchkxx/Makefile:1.14      Fri May  9 14:53:22 2025
+++ pkgsrc/pkgtools/pkgchkxx/Makefile   Fri May  9 15:41:49 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2025/05/09 14:53:22 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2025/05/09 15:41:49 tnn Exp $
 
 DISTNAME=      pkgchkxx-0.3.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    pkgtools
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=depressed-pho/}
 GITHUB_RELEASE=        ${DISTNAME}
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=               XARGS=/usr/bin/xargs
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${PKGTOOLS_VERSION} < 20211115
+.if ${NATIVE_PKG_TOOLS_BIN} != "/usr/sbin" || ${PKGTOOLS_VERSION} < 20211115
 DEPENDS+=              pkg_install>=20211115:../../pkgtools/pkg_install
 CONFIGURE_ARGS+=       PKG_ADD=${PREFIX}/sbin/pkg_add
 CONFIGURE_ARGS+=       PKG_ADMIN=${PREFIX}/sbin/pkg_admin