On Tue, May 14, 2013 at 01:01:41PM +0100, Stuart Henderson wrote:
> On 2013/05/14 13:50, Samir SAADA wrote:
> > 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.
>
> This doesn't seem to make things any worse for multi-package ports with
> READMEs (which is the only reason for subst'ing FULLPKGNAME-subpackage
> in the first please).
>
> Can you show examples of some ports which are helped by this?
>
devel/ipython suffers like this:
--- pkg/PLIST.orig Tue May 14 14:35:27 2013
+++ pkg/PLIST Tue May 14 14:35:38 2013
@@ -724,7 +724,7 @@
lib/python${MODPY_VERSION}/site-packages/IPython/zmq/session.pyc
lib/python${MODPY_VERSION}/site-packages/IPython/zmq/zmqshell.py
lib/python${MODPY_VERSION}/site-packages/IPython/zmq/zmqshell.pyc
-lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info
@man man/man1/ipcluster.1
@man man/man1/ipcontroller.1
@man man/man1/ipengine.1
@@ -1291,7 +1291,7 @@
share/doc/ipython/parallel/parallel_transition.html
share/doc/ipython/parallel/parallel_winhpc.html
share/doc/ipython/parallel/winhpc_index.html
-share/doc/ipython/py-modindex.html
+share/doc/ipython/${MODPY_PY_PREFIX}modindex.html
share/doc/ipython/search.html
share/doc/ipython/searchindex.js
share/doc/ipython/whatsnew/
packages like devel/mercurial, devel/bzr
and other python packages would have 'foobar-${MODPY_EGG_VERSION}'
automatically replaced by ${FULLPKGNAME} instead of ${FULLPKGNAME\-}
unless it is forbidden to use FULLPKGNAME for anything else than readme files...
> >
> >
> > 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/;
> > }
> > }
> > }
> >
>
