From owner-cvs-all@FreeBSD.ORG Wed Mar 19 21:47:16 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94C451065676; Wed, 19 Mar 2008 21:47:16 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C7308FC17; Wed, 19 Mar 2008 21:47:16 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2JLlGp5011277; Wed, 19 Mar 2008 21:47:16 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2JLlGtn011276; Wed, 19 Mar 2008 21:47:16 GMT (envelope-from dougb) Message-Id: <200803192147.m2JLlGtn011276@repoman.freebsd.org> From: Doug Barton Date: Wed, 19 Mar 2008 21:47:16 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/ports-mgmt/portmaster/files portmaster.sh.in 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: Wed, 19 Mar 2008 21:47:16 -0000 dougb 2008-03-19 21:47:16 UTC FreeBSD ports repository Modified files: ports-mgmt/portmaster/files portmaster.sh.in Log: New Implementation ================== The previous code tried to handle moved ports in much the same way as it handled replacing a port with the -o option, but this would sometimes create problems if we are deep in a dependency graph. So rather than re-implement only a portion of the -o code, use the whole thing instead. We accomplish this by either exec'ing ourselves with the proper -o options if we are in the dependency tree, or by asking the user to restart with the proper -o options if they specified the moved port on the command line. The latter is necessary to avoid having to duplicate all the "initialize the parent process" code. This allows me to simplify the code in a few places since -o is now the only special case. Bug Fixes ========= 1. Don't try to derive $portdir from $upg_port if using -o 2. Don't try to build a port with an +IGNOREME file if we are doing the dependent ports in -r mode Minor tweak: Add some whitespace after a warning message Revision Changes Path 2.2 +18 -22 ports/ports-mgmt/portmaster/files/portmaster.sh.in