From owner-svn-src-head@FreeBSD.ORG  Tue Jun  4 00:38:19 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A1BF2322;
 Tue,  4 Jun 2013 00:38:19 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 94967101A;
 Tue,  4 Jun 2013 00:38:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r540cJI5047401;
 Tue, 4 Jun 2013 00:38:19 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r540cJZ9047400;
 Tue, 4 Jun 2013 00:38:19 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306040038.r540cJZ9047400@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 4 Jun 2013 00:38:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251355 - head/usr.sbin/bsdconfig/share/packages
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jun 2013 00:38:19 -0000

Author: dteske
Date: Tue Jun  4 00:38:19 2013
New Revision: 251355
URL: http://svnweb.freebsd.org/changeset/base/251355

Log:
  Fix menu accenting for the package category list. The single-space indent
  for duplicate initial-characters was removed for making comparisons but was
  not put back.

Modified:
  head/usr.sbin/bsdconfig/share/packages/packages.subr

Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/packages.subr	Tue Jun  4 00:35:57 2013	(r251354)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subr	Tue Jun  4 00:38:19 2013	(r251355)
@@ -73,13 +73,13 @@ SELECTED_PACKAGES=
 #
 f_package_accent_category_menu()
 {
-	local var_to_set="$1" cat desc help varcat menu_buf n
+	local var_to_set="$1" category cat desc help varcat menu_buf n
 	shift 1 # var_to_set
 	while [ $# -gt 0 ]; do
-		cat="${1%\*}" desc="${2%%; *}" help="$3"
+		category="${1%\*}" desc="${2%%; *}" help="$3"
 		shift 3 # cat/desc/help
 
-		cat="${cat# }" # Trim leading space inserted by sort-method
+		cat="${category# }" # Trim lead space inserted by sort-method
 		f_str2varname "$cat" varcat
 
 		# Add number of installed packages for this category (if any)
@@ -99,11 +99,11 @@ f_package_accent_category_menu()
 		[ $n -ge 1 ] && desc="$desc; $n $msg_selected"
 
 		# Re-Add asterisk to the category if its index has been cached
-		f_isset _index_page_${varcat}_1 && cat="$cat*"
+		f_isset _index_page_${varcat}_1 && category="$category*"
 
 		# Update buffer with modified elements
 		menu_buf="$menu_buf
-		'$cat' '$desc' '$help'" # End-Quote
+		'$category' '$desc' '$help'" # End-Quote
 	done
 	setvar "$var_to_set" "$menu_buf" # return our buffer
 }