From owner-cvs-ports@FreeBSD.ORG Thu Dec 10 23:46:04 2009 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99D0B1065679; Thu, 10 Dec 2009 23:46:04 +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 89C758FC14; Thu, 10 Dec 2009 23:46:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBANk41G076372; Thu, 10 Dec 2009 23:46:04 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBANk4CA076371; Thu, 10 Dec 2009 23:46:04 GMT (envelope-from dougb) Message-Id: <200912102346.nBANk4CA076371@repoman.freebsd.org> From: Doug Barton Date: Thu, 10 Dec 2009 23:46:04 +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-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2009 23:46:04 -0000 dougb 2009-12-10 23:46:04 UTC FreeBSD ports repository Modified files: ports-mgmt/portmaster/files portmaster.sh.in Log: Bug Fixes ========= 1. In the test for -PP being alone on the command line I forgot the -dash at the beginning of the second test so it was falsely picking up ports with names like p5-Devel-PPPort. 2. If you are building more than one port on the command line, and you use --packages-build and/or --delete-build-only, and one of the ports on the command line would otherwise qualfiy as a build-only dep, it was falsely being treated as such. Solve this problem by adding all ports on the command line to the run_dl_g list in multiport(). 3. With the new parser if you use -v with --check-port-dbdir it's going to be $1, not $2. 4. Don't unset the packages_init function till we're actually done using it 5. If you are using -g plus one of the --packages* options then creation of the new package will fail since there is nothing for 'make package' to work with. So change backup_package() to a more generic form called pm_pkg_create and use that for both making backup packages and making a new local package from an installed package. 6. In order to facilitate 5, update the dependency information in an installed package's +CONTENTS file before creating the new package. Minor Tweaks ============ 1. Include the [-v] in the detailed usage() for --check-port-dbdir too 2. Make the output of --version more clear to everyone who isn't me :) 3. If DISTDIR is its own zfs filesystem then the code to delete empty DIST_SUBDIRs can cause problems, so special case it in its own function. 4. Remove some white space Revision Changes Path 2.14 +75 -37 ports/ports-mgmt/portmaster/files/portmaster.sh.in