From owner-svn-ports-all@FreeBSD.ORG  Sat Aug 25 12:02:28 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EB423106567A;
	Sat, 25 Aug 2012 12:02:28 +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 D647C8FC15;
	Sat, 25 Aug 2012 12:02:28 +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 q7PC2Sv5034760;
	Sat, 25 Aug 2012 12:02:28 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PC2StR034758;
	Sat, 25 Aug 2012 12:02:28 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201208251202.q7PC2StR034758@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sat, 25 Aug 2012 12:02:28 +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: r303131 - 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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 12:02:29 -0000

Author: crees
Date: Sat Aug 25 12:02:28 2012
New Revision: 303131
URL: http://svn.freebsd.org/changeset/ports/303131

Log:
  Fix the -y option to test for possible duplicate ports; use INDEX instead of
  modules file that was removed.
  
  It's fast, use it!

Modified:
  head/Tools/scripts/addport

Modified: head/Tools/scripts/addport
==============================================================================
--- head/Tools/scripts/addport	Sat Aug 25 12:01:11 2012	(r303130)
+++ head/Tools/scripts/addport	Sat Aug 25 12:02:28 2012	(r303131)
@@ -169,9 +169,9 @@ if ($dir eq "") {
 
 if ($checkexist) {
 	my $found = 0;
-	print ">> Checking out modules file to scan for duplicates...";
-#	system("$cvs -q co -p modules > $tmpdir/modules") && errx(1, "Could not checkout CVSROOT/modules.");
-	print " [DONE]\n";
+	print ">> Fetching INDEX to scan for duplicates...\n";
+	my $indexfile = "$tmpdir/" . `$make -C $portsdir -V INDEXFILE`;
+	system("$make -C /usr/ports INDEXDIR=$tmpdir fetchindex") && errx(1, "Could not fetch INDEX file.");
 	my @namepart;
 	foreach (split(/\,/, $dir)) {
 		s/^.*\///;
@@ -180,9 +180,10 @@ if ($checkexist) {
 			push(@namepart, $_);
 		}
 	}
-	open(MODULES_FILE, "< $tmpdir/modules") or errx(1, "Modules file in $tmpdir unreadable.");
-	while (my $line = <MODULES_FILE>) {
-		next if $line =~ /^#/;
+	open(INDEXFILE, "< $indexfile") or errx(1, "$indexfile unreadable.");
+	while (my $line = <INDEXFILE>) {
+		$line =~ m,^[^|]*\|/usr/ports/[^/]*/([^|]*)\|,;
+		$line = $1;
 		foreach my $dpart (@namepart) {
 			if ($line =~ /^[^ ]*\b$dpart\b/i) {
 				$line =~ s/\s+/ /g;