From owner-cvs-all@FreeBSD.ORG Mon May 10 23:23:45 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7F43106568F; Mon, 10 May 2010 23:23:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9F448FC1C; Mon, 10 May 2010 23:23:45 +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 o4ANNjai089002; Mon, 10 May 2010 23:23:45 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ANNjhS089001; Mon, 10 May 2010 23:23:45 GMT (envelope-from dougb) Message-Id: <201005102323.o4ANNjhS089001@repoman.freebsd.org> From: Doug Barton Date: Mon, 10 May 2010 23:23:45 +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: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2010 23:23:45 -0000 dougb 2010-05-10 23:23:45 UTC FreeBSD ports repository Modified files: ports-mgmt/portmaster/files portmaster.sh.in Log: New Feature =========== Add a --packages-local option for those who wish to use only local packages, and never attempt to fetch from a remote site. Bug Fix ======= Fix a braino for --index-first and --index-only: The cross-checking of the command line options needs to happen before the environment variables are set. Cleanups And Optimizations ========================== 1. LOCALBASE_COMPAT is only ever used in combination with /pkg at the end, so fold that into the variable to start with. 2. Indicate to the user that -p is deprecated 3. Allow setting of DISTDIR directly in .portmasterrc like the other widely used vars. This entails the following: a. Capitalize distdir every place that it's used. b. Add to the list of --options to check which mean we don't even have to try to set it. This saves us a call to make(1). c. Don't set it to / if DISTDIR is empty, which makes error checking later on easier. d. Mark DISTDIR (and related vars) global in a few more functions to make it consistent. 4. Move the test for version > 6.4 first in the list, no point in processing a bunch of stuff only to bail out later. 5. Unset the test_command_line function when we're done using it 6. Be smarter about whether or not to use $PM_SU_CMD to fetch the INDEX.bz2 7. Improve cross-option error checking for the --packages* options Revision Changes Path 2.26 +99 -65 ports/ports-mgmt/portmaster/files/portmaster.sh.in