From owner-svn-ports-head@freebsd.org  Wed Sep 16 11:17:20 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F184B9CE2AB;
 Wed, 16 Sep 2015 11:17:20 +0000 (UTC)
 (envelope-from bofh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E25911CF4;
 Wed, 16 Sep 2015 11:17:20 +0000 (UTC)
 (envelope-from bofh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8GBHKM5047921;
 Wed, 16 Sep 2015 11:17:20 GMT (envelope-from bofh@FreeBSD.org)
Received: (from bofh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8GBHKF2047920;
 Wed, 16 Sep 2015 11:17:20 GMT (envelope-from bofh@FreeBSD.org)
Message-Id: <201509161117.t8GBHKF2047920@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bofh set sender to
 bofh@FreeBSD.org using -f
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Date: Wed, 16 Sep 2015 11:17:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397055 - head/ports-mgmt/pkg_cutleaves/files
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2015 11:17:21 -0000

Author: bofh
Date: Wed Sep 16 11:17:20 2015
New Revision: 397055
URL: https://svnweb.freebsd.org/changeset/ports/397055

Log:
  ports-mgmt/pkg_cutleaves: Fix exclude list REGEXP
  
  Submitted by:	cejkar@fit.vutbr.cz

Modified:
  head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves

Modified: head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves
==============================================================================
--- head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves	Wed Sep 16 11:10:23 2015	(r397054)
+++ head/ports-mgmt/pkg_cutleaves/files/pkg_cutleaves	Wed Sep 16 11:17:20 2015	(r397055)
@@ -286,7 +286,7 @@ sub set_excl_pattern {
   $exclpattern = @excludes 
     ? join('|', map{qr(\Q$_\E)} @excludes) 
     : ' '; # default non-exclusive 
-  $exclpattern = qr{^($exclpattern)}o;
+  $exclpattern = qr{^($exclpattern)$}o;
 }
 
 #
@@ -317,7 +317,7 @@ sub get_excludelist {
 #
 sub get_packages {
   my @pkgs;
-  open(PKGQUERY, '-|', @pkgquery, '-a', '%n-%v\t%?r\t%c')
+  open(PKGQUERY, '-|', @pkgquery, '-a', '%n\t%n-%v\t%?r\t%c')
     or die "Couldn't read output from $pkgquery[0]!";
   while (my $p = <PKGQUERY>) {
     chomp($p);
@@ -334,9 +334,9 @@ sub get_leaves {
   my %leaves;
   my @pkgs = get_packages(); 
   foreach my $pkg (@pkgs) {
-    my ($file, $required, $comment) = @$pkg;
+    my ($name, $file, $required, $comment) = @$pkg;
     unless ($required) {
-      if ($file =~ $exclpattern) {
+      if ($name =~ $exclpattern) {
         $leavestokeep{$file} = 1;
       }
       else {