From owner-freebsd-bugs@FreeBSD.ORG  Sat Apr 12 14:10:12 2003
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 67E1E37B404
	for <freebsd-bugs@hub.freebsd.org>;
	Sat, 12 Apr 2003 14:10:12 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0AB3543FBF
	for <freebsd-bugs@hub.freebsd.org>;
	Sat, 12 Apr 2003 14:10:12 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3CLABUp086135
	for <freebsd-bugs@freefall.freebsd.org>;
	Sat, 12 Apr 2003 14:10:11 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3CLABDt086134;
	Sat, 12 Apr 2003 14:10:11 -0700 (PDT)
Date: Sat, 12 Apr 2003 14:10:11 -0700 (PDT)
Message-Id: <200304122110.h3CLABDt086134@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Dominic Marks <dom@cus.org.uk>
Subject: Re: bin/46830: Make pkg_add respect prefix for dependancies
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Dominic Marks <dom@cus.org.uk>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2003 21:10:12 -0000

The following reply was made to PR bin/46830; it has been noted by GNATS.

From: Dominic Marks <dom@cus.org.uk>
To: freebsd-gnats-submit@freebsd.org, dom@cus.org.uk
Cc:  
Subject: Re: bin/46830: Make pkg_add respect prefix for dependancies
Date: Sat, 12 Apr 2003 22:01:33 +0100

 Hey,
 
 I didn't quite get the diff right last time, forgetting that there are
 now differences between pkg_add in 4 and 5. Also GNATS seems to have
 completely lost my first attempt at a followup. Here is a better diff:
 
 I'm hoping it will apply cleanly to pkg_add in 4 and 5.
 
 Index: perform.c
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/pkg_install/add/perform.c,v
 retrieving revision 1.57.2.15
 diff -u -3 -p -u -r1.57.2.15 perform.c
 --- perform.c	25 Sep 2002 23:22:13 -0000	1.57.2.15
 +++ perform.c	12 Apr 2003 20:57:03 -0000
 @@ -68,7 +68,7 @@ pkg_do(char *pkg)
      char extract_contents[FILENAME_MAX];
      char *where_to, *extract;
      FILE *cfile;
 -    int code;
 +    int code, rv;
      PackingList p;
      struct stat sb;
      int inPlace;
 @@ -280,12 +280,19 @@ pkg_do(char *pkg)
  		    if (cp) {
  			if (Verbose)
  			    printf("Loading it from %s.\n", cp);
 -			if (vsystem("pkg_add %s'%s'", Verbose ? "-v " : "", cp)) {
 -			    warnx("autoload of dependency '%s' failed%s",
 -				cp, Force ? " (proceeding anyway)" : "!");
 -			    if (!Force)
 -				++code;
 -			}
 +				if (Prefix == NULL) {
 +				rv = vsystem("pkg_add %s'%s'",
 +					Verbose ? "-v " : "", cp);
 +				} else {
 +				rv = vsystem("pkg_add %s -p '%s' '%s'",
 +					Verbose ? "-v" : "", Prefix, cp);
 +				}
 +				if (rv) {
 +			    	warnx("autoload of dependency '%s' failed%s",
 +					cp, Force ? " (proceeding anyway)" : "!");
 +			    	if (!Force)
 +					++code;
 +				}
  		    }
  		    else {
  			warnx("could not find package %s %s",
 
 
 Thanks,
 -- 
 Dominic
  <dom at cus.org.uk> <d.marks at student.umist.ac.uk>