diff options
| author | hubertf <hubertf> | 2001-05-20 00:54:09 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2001-05-20 00:54:09 +0000 |
| commit | c96dd473cd066feea667b1ec0523f141f056fe69 (patch) | |
| tree | 0e321ee32550679c771a00dc90c33e73f965b54d /mk | |
| parent | 4e545a10c8865d3481060655a404df385fe08d70 (diff) | |
| download | pkgsrc-c96dd473cd066feea667b1ec0523f141f056fe69.tar.gz | |
Fix two problems when using a ksh(1) as /bin/sh (ln -sf /bin/ksh /bin/sh [*]):
* umask handlint due to umask producing different number of leading 0s in
ksh(1) and sh(1)
* dependency handling is different due to "`...`" being interpreted
differently
([*] needed on NetBSD 1.5.1_BETA2/cobalt, as /bin/sh keeps on dumping core
in ramdom situations.)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 26ca6d3bcd2..475f69bbdbc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.742 2001/05/18 16:23:20 skrll Exp $ +# $NetBSD: bsd.pkg.mk,v 1.743 2001/05/20 00:54:09 hubertf Exp $ # # This file is in the public domain. # @@ -1751,7 +1751,7 @@ real-su-install: ${MESSAGE} exit 1; \ fi .endif # !NO_PKG_REGISTER && !NO_FORCE_REGISTER - ${_PKG_SILENT}${_PKG_DEBUG}if [ `${SH} -c umask` != ${DEF_UMASK} ]; then \ + ${_PKG_SILENT}${_PKG_DEBUG}if [ `${SH} -c umask` -ne ${DEF_UMASK} ]; then \ ${ECHO_MSG} "${_PKGSRC_IN}> Warning: your umask is \"`${SH} -c umask`"\".; \ ${ECHO_MSG} "If this is not desired, set it to an appropriate value (${DEF_UMASK})"; \ ${ECHO_MSG} "and install this package again by \`\`${MAKE} deinstall reinstall''."; \ @@ -2745,7 +2745,7 @@ install-depends: uptodate-pkgtools ${_PKG_SILENT}${_PKG_DEBUG} \ pkg="${dep:C/:.*//}"; \ dir="${dep:C/[^:]*://:C/:.*$//}"; \ - found="`${PKG_INFO} -e \"$$pkg\" || ${TRUE}`"; \ + found=`${PKG_INFO} -e "$$pkg" || ${TRUE}`; \ if [ "$$found" != "" ]; then \ instobjfmt=`${PKG_INFO} -B "$$pkg" | ${AWK} '/^OBJECT_FMT/ {print $$2}' | ${HEAD} -1`; \ if [ "$$instobjfmt" = "" ]; then \ |