From owner-svn-ports-head@FreeBSD.ORG  Sun Mar  3 16:55:55 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-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 B363C615;
 Sun,  3 Mar 2013 16:55:55 +0000 (UTC)
 (envelope-from crees@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 97F8EF3F;
 Sun,  3 Mar 2013 16:55:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r23Gttjt009588;
 Sun, 3 Mar 2013 16:55:55 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r23Gttd6009587;
 Sun, 3 Mar 2013 16:55:55 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201303031655.r23Gttd6009587@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 3 Mar 2013 16:55:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313368 - head/Tools/scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Mar 2013 16:55:55 -0000

Author: crees
Date: Sun Mar  3 16:55:54 2013
New Revision: 313368
URL: http://svnweb.freebsd.org/changeset/ports/313368

Log:
  Apparently some people override PKGCATEGORY, so
  manually extract it from CATEGORIES again.
  
  Discovered by:	dinoex

Modified:
  head/Tools/scripts/addport

Modified: head/Tools/scripts/addport
==============================================================================
--- head/Tools/scripts/addport	Sun Mar  3 16:52:56 2013	(r313367)
+++ head/Tools/scripts/addport	Sun Mar  3 16:55:54 2013	(r313368)
@@ -237,9 +237,8 @@ foreach my $thisdir (@dirs) {
 	}
 
 	# Get the category name and make it suitable for use with svn
-	my $category;
-	$category = `$make -V PKGCATEGORY`;
-	chomp $category;
+	my @categories = split(/ /, `make -VCATEGORIES`);
+	my $category = $categories[0];
 	if ($interactive) {
 		if (prompt("Port $portname will be put in category $category.  OK? " )) {
 			do {