From owner-svn-ports-all@FreeBSD.ORG Fri Aug 10 10:49:36 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AFBC01065672; Fri, 10 Aug 2012 10:49:36 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9ACA48FC0C; Fri, 10 Aug 2012 10:49:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7AAnamm023113; Fri, 10 Aug 2012 10:49:36 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7AAnaSW023110; Fri, 10 Aug 2012 10:49:36 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201208101049.q7AAnaSW023110@svn.freebsd.org> From: Chris Rees Date: Fri, 10 Aug 2012 10:49:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302383 - head/Tools/scripts X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2012 10:49:36 -0000 Author: crees Date: Fri Aug 10 10:49:36 2012 New Revision: 302383 URL: http://svn.freebsd.org/changeset/ports/302383 Log: Don't replace - with _ in category variable. This was required with CVS, since the category was checked out as a module, but the directory name is used with svn. For example: pcvs co ports_ports_mgmt svn co $ports/head/ports-mgmt Submitted by: swills Modified: head/Tools/scripts/addport Modified: head/Tools/scripts/addport ============================================================================== --- head/Tools/scripts/addport Fri Aug 10 10:34:59 2012 (r302382) +++ head/Tools/scripts/addport Fri Aug 10 10:49:36 2012 (r302383) @@ -245,8 +245,7 @@ foreach my $thisdir (@dirs) { } while (prompt("Is the new category $category OK? ")); } } - chomp(my $svn_category = $category); - $svn_category =~ s/-/_/g; + chomp $category; # Do commitfile checking but only if the user did not request automatic filling. if (!$autofill) { @@ -321,7 +320,7 @@ foreach my $thisdir (@dirs) { # let's get our hands dirty. if (! -d $category) { - system("svn co --depth files $repo/$svn_category $category") && errx(1, "can't get temporary category directory, aborting."); + system("svn co --depth files $repo/$category $category") && errx(1, "can't get temporary category directory, aborting."); } chdir $category or err(1,"$category"); system("$cp -PRp $thisdir .");