pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc When there is no distinfo file, do not apply patches w...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b0569deb414
branches:  trunk
changeset: 463618:1b0569deb414
user:      cube <cube%pkgsrc.org@localhost>
date:      Thu Nov 20 15:07:53 2003 +0000

description:
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.

diffstat:

 mk/bsd.pkg.mk                 |  7 ++++++-
 pkgtools/pkg_install/distinfo |  2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r e58ee155b4f1 -r 1b0569deb414 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Nov 20 14:26:00 2003 +0000
+++ b/mk/bsd.pkg.mk     Thu Nov 20 15:07:53 2003 +0000
@@ -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 @@
                                                fail="$$fail $$filename"; \
                                                continue;               \
                                        fi;                             \
+                               else                                    \
+                                       ${ECHO_MSG} "**************************************"; \
+                                       ${ECHO_MSG} "Ignoring unknown patch file: $$i"; \
+                                       ${ECHO_MSG} "**************************************"; \
+                                       continue;
                                fi;                                     \
                                ;;                                      \
                        esac;                                           \
diff -r e58ee155b4f1 -r 1b0569deb414 pkgtools/pkg_install/distinfo
--- a/pkgtools/pkg_install/distinfo     Thu Nov 20 14:26:00 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-$NetBSD: distinfo,v 1.26 2003/11/10 16:32:56 hubertf Exp $
-



Home | Main Index | Thread Index | Old Index