diff options
author | cube <cube@pkgsrc.org> | 2003-11-20 15:07:53 +0000 |
---|---|---|
committer | cube <cube@pkgsrc.org> | 2003-11-20 15:07:53 +0000 |
commit | f02636860dab26b4d452f40c080abd3544a1e1e6 (patch) | |
tree | 1f66c9f502aaa6e84135360f90bdbfe1c5084e3e | |
parent | 42670a0633cb2601771234b40375b5f8ac59e217 (diff) | |
download | pkgsrc-f02636860dab26b4d452f40c080abd3544a1e1e6.tar.gz |
When there is no distinfo file, do not apply patches we would not
normally apply: treat them as if the distinfo file was empty.
This solves the reason why pkgtools/pkg_install/distinfo was resurrected,
and allows us to remove it again, since it had the side effect of
introducing a dependency on digest, which is not acceptable when updating
pkg_install: it made it impossible to use the pkgsrc tree, as reported
by several people.
-rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
-rw-r--r-- | pkgtools/pkg_install/distinfo | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 16a6d1fff47..4da9fe71845 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1301 2003/11/02 14:36:46 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1302 2003/11/20 15:07:53 cube Exp $ # # This file is in the public domain. # @@ -2186,6 +2186,11 @@ do-patch: uptodate-digest fail="$$fail $$filename"; \ continue; \ fi; \ + else \ + ${ECHO_MSG} "**************************************"; \ + ${ECHO_MSG} "Ignoring unknown patch file: $$i"; \ + ${ECHO_MSG} "**************************************"; \ + continue; fi; \ ;; \ esac; \ diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo deleted file mode 100644 index 0bfbd4305c7..00000000000 --- a/pkgtools/pkg_install/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -$NetBSD: distinfo,v 1.26 2003/11/10 16:32:56 hubertf Exp $ - |