From owner-svn-src-user@FreeBSD.ORG  Tue Aug  3 22:59:02 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB6D8106567A;
	Tue,  3 Aug 2010 22:59:02 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F6FE8FC13;
	Tue,  3 Aug 2010 22:59:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o73Mx2H4086426;
	Tue, 3 Aug 2010 22:59:02 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o73Mx2Yo086424;
	Tue, 3 Aug 2010 22:59:02 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008032259.o73Mx2Yo086424@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 3 Aug 2010 22:59:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210831 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Aug 2010 22:59:02 -0000

Author: dougb
Date: Tue Aug  3 22:59:02 2010
New Revision: 210831
URL: http://svn.freebsd.org/changeset/base/210831

Log:
  Step 1 of the code whitespace overhaul, realign the code related to the
  -G revamp, and remove the placeholders

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Aug  3 22:41:15 2010	(r210830)
+++ user/dougb/portmaster/portmaster	Tue Aug  3 22:59:02 2010	(r210831)
@@ -2120,23 +2120,19 @@ update_build_l () {
 }
 
 update_port () {
-	local update_to
+	local update_to deps
 
 	[ -n "$2" ] && update_to=" to $2"
 	echo "===>>> Launching child to update ${1#$pd/}${update_to}"
 
-#
-		local deps
-
-		dep_of_deps=$(( $dep_of_deps + 1 ))
+	dep_of_deps=$(( $dep_of_deps + 1 ))
 
-		if [ -n "$PM_FIRST_PASS" ]; then
-			num_of_deps=$(( $num_of_deps + 1 ))
-			update_build_l $1
-		fi
+	if [ -n "$PM_FIRST_PASS" ]; then
+		num_of_deps=$(( $num_of_deps + 1 ))
+		update_build_l $1
+	fi
 
-		deps=" (${dep_of_deps}/${num_of_deps})"
-#
+	deps=" (${dep_of_deps}/${num_of_deps})"
 
 	if [ -n "$PM_DEPTH" ]; then
 		echo "	${PM_DEPTH}>> ${1#$pd/}"
@@ -2246,8 +2242,6 @@ dependency_check () {
 	else
 		if [ -n "$SHOW_WORK" ]; then
 			echo ''
-#
-#
 		elif [ -z "$PM_VERBOSE" ]; then
 			echo "===>>> Starting dependency check"
 		fi
@@ -2394,10 +2388,8 @@ dependency_check () {
 		case "$PM_DEPTH" in
 		*\>\>*)	echo "	$PM_DEPTH" ;;
 		*)	if [ "$PM_PARENT_PORT" = All ]; then
-#
-					local deps
-					deps=" (${dep_of_deps}/${num_of_deps})"
-#
+				local deps
+				deps=" (${dep_of_deps}/${num_of_deps})"
 				term_printf " >> ${upg_port:-$portdir}${deps}"
 			else
 				term_printf
@@ -2709,19 +2701,17 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S
 		fi
 	fi
 
-#
-		PM_FP_SEEN_LIST=':' ; PM_FIRST_PASS=pm_first_pass
-		NO_DEP_UPDATES=no_dep_updates ; build_l=''
-		export PM_FP_SEEN_LIST PM_FIRST_PASS NO_DEP_UPDATES build_l
+	PM_FP_SEEN_LIST=':' ; PM_FIRST_PASS=pm_first_pass
+	NO_DEP_UPDATES=no_dep_updates ; build_l=''
+	export PM_FP_SEEN_LIST PM_FIRST_PASS NO_DEP_UPDATES build_l
 
-		if [ -n "$PM_BUILD_ONLY_LIST" ]; then
-			run_dl_g='' ; build_only_dl_g='' ; rundep_list=''
-			export run_dl_g build_only_dl_g rundep_list
-		fi
-		if [ -n "$PM_DEL_BUILD_ONLY" ]; then
-			build_deps_il='' ; export build_deps_il
-		fi
-#
+	if [ -n "$PM_BUILD_ONLY_LIST" ]; then
+		run_dl_g='' ; build_only_dl_g='' ; rundep_list=''
+		export run_dl_g build_only_dl_g rundep_list
+	fi
+	if [ -n "$PM_DEL_BUILD_ONLY" ]; then
+		build_deps_il='' ; export build_deps_il
+	fi
 
 	[ -z "$NO_BACKUP" ] && init_packages
 	[ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE
@@ -2844,15 +2834,10 @@ all_first_pass () {
 			continue
 		fi
 
-#
-			check_interactive $iport || continue
-			# We got here, so we know we have to build it
-			update_port $iport
-#
-#
-#
-#
-#
+		check_interactive $iport || continue
+
+		# We got here, so we know we have to build it
+		update_port $iport
 	done
 
 	echo "===>>> Update check of installed ports complete" ; echo ''
@@ -2982,7 +2967,6 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th
 			fi
 			;;
 		esac
-#
 	elif [ -n "$URB_YES" ]; then
 		echo ''
 		echo "===>>> $upg_port has an +IGNOREME file, ignoring"