[pkgsrc/trunk]: pkgsrc/mk Use the -S argument to pkg_admin(1) if it exists.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9fc0c575b654
branches:  trunk
changeset: 462670:9fc0c575b654
user:      agc <agc%pkgsrc.org@localhost>
date:      Wed Oct 08 10:07:20 2003 +0000

description:
Use the -S argument to pkg_admin(1) if it exists.

diffstat:

 mk/bsd.prefs.mk |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 6018ac2cdf45 -r 9fc0c575b654 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed Oct 08 10:06:47 2003 +0000
+++ b/mk/bsd.prefs.mk   Wed Oct 08 10:07:20 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.128 2003/09/24 12:22:04 grant Exp $
+# $NetBSD: bsd.prefs.mk,v 1.129 2003/10/08 10:07:20 agc Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -348,13 +348,19 @@
 # "${PKG_INFO} -e pkgpattern" if the latter would return more than one
 # package name.
 #
-PKG_BEST_EXISTS?=      ${PKG_ADMIN} -b -d ${_PKG_DBDIR} -s "" lsbest
+PKG_BEST_EXISTS?=      ${PKG_ADMIN} -b -d ${_PKG_DBDIR} ${_NULL_SUFFIX} lsbest
 
 .ifndef PKGTOOLS_VERSION
 PKGTOOLS_VERSION!=     ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302
 MAKEFLAGS+=            PKGTOOLS_VERSION="${PKGTOOLS_VERSION}"
 .endif
 
+.if ${PKGTOOLS_VERSION} >= 20030918
+_NULL_SUFFIX=          -S
+.else
+_NULL_SUFFIX=          -s ""
+.endif
+
 .if (${OPSYS} == SunOS) && !defined(ZOULARIS_VERSION)
 .  if !exists(${ZOULARISBASE}/share/mk/zoularis.mk)
 ZOULARIS_VERSION=      20000522