From owner-cvs-all@FreeBSD.ORG Mon May 3 22:28:22 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 EC942106564A; Mon, 3 May 2010 22:28:22 +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 DD2078FC0C; Mon, 3 May 2010 22:28:22 +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 o43MSMs7088569; Mon, 3 May 2010 22:28:22 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o43MSMID088568; Mon, 3 May 2010 22:28:22 GMT (envelope-from dougb) Message-Id: <201005032228.o43MSMID088568@repoman.freebsd.org> From: Doug Barton Date: Mon, 3 May 2010 22:28:22 +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, 03 May 2010 22:28:23 -0000 dougb 2010-05-03 22:28:22 UTC FreeBSD ports repository Modified files: ports-mgmt/portmaster/files portmaster.sh.in Log: New Feature ============ Add a --no-index-fetch option for people who want to use the --index* options but do not want portmaster to do the fetching. Cleanup and Fixes ================= 1. Remove no longer necessary local variable in version() 2. Rework how some initial variables are set. Deriving the values via make works, but is very slow. So try to be more intelligent about recognizing the standard values for the ones we always need to have. * For PORTSDIR and PKG_DBDIR if those variables are not in the environment and the standard directories exist, use them. * Move the setting of pd (PORTSDIR) up to before the INDEX-related items so that we can use ${INDEXDIR:-$pd} * The derivation of the INDEX-related stuff wasn't working (since we didn't know $pd) and no one has complained, so just use the default values from bsd.port.mk unless the user specifies others. * If /var/db/ports exists, use it for port_dbdir 3. Indicate that the -[lL] options are not compatible with -FRaefnors, updates, or installs 4. In the test to see if we downloaded a new INDEX.bz2 file supply a default value for index_time so that if the file did not exist previously the test will not fail. Revision Changes Path 2.25 +59 -54 ports/ports-mgmt/portmaster/files/portmaster.sh.in