From owner-cvs-all@FreeBSD.ORG Tue Jan 10 22:15:06 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8291A16A41F; Tue, 10 Jan 2006 22:15:06 +0000 (GMT) (envelope-from krion@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46F6043D49; Tue, 10 Jan 2006 22:15:06 +0000 (GMT) (envelope-from krion@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0AMF6p1003987; Tue, 10 Jan 2006 22:15:06 GMT (envelope-from krion@repoman.freebsd.org) Received: (from krion@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0AMF62i003986; Tue, 10 Jan 2006 22:15:06 GMT (envelope-from krion) Message-Id: <200601102215.k0AMF62i003986@repoman.freebsd.org> From: Kirill Ponomarew Date: Tue, 10 Jan 2006 22:15:06 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/usr.sbin/pkg_install/add extract.c src/usr.sbin/pkg_install/create perform.c pkg_create.1 pl.c src/usr.sbin/pkg_install/info show.c src/usr.sbin/pkg_install/lib plist.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2006 22:15:06 -0000 krion 2006-01-10 22:15:06 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) usr.sbin/pkg_install/add extract.c usr.sbin/pkg_install/create perform.c pkg_create.1 pl.c usr.sbin/pkg_install/info show.c usr.sbin/pkg_install/lib plist.c Log: MFC: add/extract.c:1.44 create/perform.c:1.82 create/pkg_create.1:1.70 create/pl.c:1.28 info/show.c:1.40 lib/plist.c:1.51 date: 2006/01/07 22:10:57; author: krion; state: Exp; lines: +10 -3 When using @cwd %%FOO%%, we must ensure to return in the original prefix later, but doing so with @cwd %%OLDPREFIX%% (having PLIST_SUB+="OLDPREFIX=${PREFIX}") hardcodes the value in the packing list. That's not really a problem when dealing with ports but that's a problem with packages since pkg_add -p option only overrides the first @cwd occurrence. This patch allow us to use @cwd without any argument. If no directory argument is given, it will set current working directory to the first prefix given by the @cwd command. PR: bin/77212 Submitted by: flz Revision Changes Path 1.43.2.1 +11 -2 src/usr.sbin/pkg_install/add/extract.c 1.80.2.2 +7 -0 src/usr.sbin/pkg_install/create/perform.c 1.68.2.2 +5 -1 src/usr.sbin/pkg_install/create/pkg_create.1 1.27.8.1 +10 -3 src/usr.sbin/pkg_install/create/pl.c 1.38.2.2 +4 -1 src/usr.sbin/pkg_install/info/show.c 1.50.2.1 +5 -2 src/usr.sbin/pkg_install/lib/plist.c