[src/netbsd-3]: src/usr.sbin/pkg_install/add Pull up revision 1.111 (requeste...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/046936cc8f51
branches:  netbsd-3
changeset: 576811:046936cc8f51
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 30 17:39:00 2005 +0000

description:
Pull up revision 1.111 (requested by hubertf in ticket #623):
Fix PR pkg/30658: don't fail for pkgs that were built with IGNORE_RECOMMENDED,
just issue a warning.
Checked by wiz@, no reply from original author (rh@) after several weeks. :(

diffstat:

 usr.sbin/pkg_install/add/perform.c |  17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diffs (37 lines):

diff -r b2c0c0a7c757 -r 046936cc8f51 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sat Jul 30 17:38:53 2005 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sat Jul 30 17:39:00 2005 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.107.2.2 2005/07/30 17:36:16 tron Exp $   */
+/*     $NetBSD: perform.c,v 1.107.2.3 2005/07/30 17:39:00 tron Exp $   */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.107.2.2 2005/07/30 17:36:16 tron Exp $");
+__RCSID("$NetBSD: perform.c,v 1.107.2.3 2005/07/30 17:39:00 tron Exp $");
 #endif
 #endif
 
@@ -408,17 +408,8 @@
 
        if (buildinfo[BI_IGNORE_RECOMMENDED] != NULL &&
            strcasecmp(buildinfo[BI_IGNORE_RECOMMENDED], "NO") != 0) {
-               warnx("Package `%s' has", pkg);
-               warnx("IGNORE_RECOMMENDED set: This package was built with");
-               warnx("dependency recommendations ignored.  It may have been");
-               warnx("built against a set of installed packages that is");
-               warnx("different from the recommended set of pre-requisites.");
-               warnx("As a consequence, this package may not work on this");
-               warnx("or other systems with a different set of packages.");
-               if (!Force && !getenv("PKG_IGNORE_RECOMMENDED")) {
-                           warnx("aborting.");
-                           goto bomb;
-               }
+               warnx("%s was built", pkg);
+               warnx("\t to ignore recommended dependencies, this may cause problems!\n");
        }
 
        /*