diff options
| author | agc <agc@pkgsrc.org> | 2003-10-08 10:07:20 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-10-08 10:07:20 +0000 |
| commit | 2e630c6cd7d50f5090e0aefa91395f1b7238718a (patch) | |
| tree | 81fa0fb2af955b31ee0d7efb14c60fa761e903c7 | |
| parent | 775b124f24ae92e8255f3e9f885f27d2e881ce4a (diff) | |
| download | pkgsrc-2e630c6cd7d50f5090e0aefa91395f1b7238718a.tar.gz | |
Use the -S argument to pkg_admin(1) if it exists.
| -rw-r--r-- | mk/bsd.prefs.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 3062ef236a4..7bc0d806520 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ LINKFARM?= ${LINKFARM_CMD} # "${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 |