diff options
| author | abs <abs> | 2003-06-17 14:33:17 +0000 |
|---|---|---|
| committer | abs <abs> | 2003-06-17 14:33:17 +0000 |
| commit | 0e147710080ecc8af351b2c0cbf06c0ea6197d97 (patch) | |
| tree | fdb797b79e778bbb3cd2352ef3db4f46f0ac05f0 /mk | |
| parent | bb497891d45c410f0e6c546813d74eef7309d1cf (diff) | |
| download | pkgsrc-0e147710080ecc8af351b2c0cbf06c0ea6197d97.tar.gz | |
Change uptodate-digest check from excluding digest on 'digest-* | pkgchk-*)'
to excluding when ! -f ${DISTINFO_FILE}.
Now packages without distinfo do not need to build digest before installing
(such as cpuflags)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 86b1627a0fb..ccf96583ed7 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1199 2003/06/14 21:13:13 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1200 2003/06/17 14:33:17 abs Exp $ # # This file is in the public domain. # @@ -557,20 +557,14 @@ DIGEST_REQD= 20010302 uptodate-digest: ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ ! -f ${DIGEST} -o ${DIGEST_VERSION} -lt ${DIGEST_REQD} ]; then \ - case ${PKGNAME} in \ - digest-* | pkgchk-*) \ - ;; \ - *) \ - { cd ${_PKGSRCDIR}/pkgtools/digest; \ - ${MAKE} clean; \ - if [ -f ${DIGEST} ]; then \ - ${MAKE} ${MAKEFLAGS} deinstall; \ - fi; \ - ${MAKE} ${MAKEFLAGS} ${DEPENDS_TARGET}; \ - ${MAKE} ${MAKEFLAGS} clean; } \ - ;; \ - esac \ + if [ -f ${DISTINFO_FILE} -a \( ! -f ${DIGEST} -o ${DIGEST_VERSION} -lt ${DIGEST_REQD} \) ]; then \ + { cd ${_PKGSRCDIR}/pkgtools/digest; \ + ${MAKE} clean; \ + if [ -f ${DIGEST} ]; then \ + ${MAKE} ${MAKEFLAGS} deinstall; \ + fi; \ + ${MAKE} ${MAKEFLAGS} ${DEPENDS_TARGET}; \ + ${MAKE} ${MAKEFLAGS} clean; } \ fi # Latest version of pkgtools required for correct pkgsrc operation. |