diff options
| author | tv <tv@pkgsrc.org> | 1998-06-05 20:31:55 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 1998-06-05 20:31:55 +0000 |
| commit | aa36cae03c858fb32b0146254abdcb0ea0fe723b (patch) | |
| tree | 1a00687673af7139d5ad9be52eb05a2d2776d90c /mk | |
| parent | 50346a429c2f9035b1c0bb2c303b32c399019a84 (diff) | |
| download | pkgsrc-aa36cae03c858fb32b0146254abdcb0ea0fe723b.tar.gz | |
Rework the pkg_create -C check: don't check the kernel version number for
a userland binary's features; instead, check that tool directly.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 09682ba679f..3a1dc1d10f4 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.95 1998/06/05 12:45:53 mrg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.96 1998/06/05 20:31:55 tv Exp $ # # This file is in the public domain. # @@ -318,10 +318,9 @@ PKG_CMD?= /usr/sbin/pkg_create .if !defined(PKG_ARGS) PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${PLIST} -p ${PREFIX} -P "`${MAKE} package-depends|sort -u`" .if defined(CONFLICTS) -# The NETBSD_13X_REL check is to make sure that pkg_create really has the -# -C switch. This should be true for NetBSD > 1.3.2. -NETBSD_13X_REL!= /usr/bin/uname -r | /usr/bin/sed -e 's|^1\.3$$|yes|' -e 's|^1\.3\.[1-9]$$|yes|' -.if (${NETBSD_13X_REL} != "yes") +# Only use -C if the pkg_create command supports it. +__PKG_CMD_C__!= ${PKG_CMD} -C 2>&1 | /usr/bin/egrep 'illegal option' ; echo +.if (${__PKG_CMD_C__} == "") PKG_ARGS+= -C "${CONFLICTS}" .endif .endif |