Hi,
with some ports, "make plist" generates bad file paths with FULLPKGNAME\-

this patch restricts the substitution pattern that finds
the subpackage name in paths.

tested on some ports only.


Samir.



Index: infrastructure/bin/make-plist
===================================================================
RCS file: /cvs/ports/infrastructure/bin/make-plist,v
retrieving revision 1.5
diff -u -r1.5 make-plist
--- infrastructure/bin/make-plist       28 Jan 2013 21:27:59 -0000      1.5
+++ infrastructure/bin/make-plist       14 May 2013 11:03:29 -0000
@@ -453,9 +453,9 @@
 sub bugfix
 {
        my ($self, $subpackage, $reverse) = @_;
-       if ($self->{name} =~ m/\$\{(.*)\\$subpackage\}/) {
+       if ($self->{name} =~ m/\$\{([^\}]*)\\$subpackage\}/) {
                if ($reverse->{h}->{$1.$subpackage}) {
-                       $self->{name} =~ s/(\$\{.*)\\$subpackage\}/$1\}/;
+                       $self->{name} =~ s/(\$\{[^\}]*)\\$subpackage/$1/;
                }
        }
 }

Reply via email to